mac80211: fix TID for null poll response
authorJohannes Berg <johannes.berg@intel.com>
Thu, 13 Oct 2011 11:19:19 +0000 (13:19 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 14 Oct 2011 18:48:23 +0000 (14:48 -0400)
The queue mapping/TID for non-QoS null data
responses to is never set, making it default
to BK. Fix that.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/sta_info.c

index 076593bffbcfa15778b637bbc0f833099785ad0d..2e2c71194c805d083b626395553c726b71cad486 100644 (file)
@@ -1203,11 +1203,9 @@ static void ieee80211_send_null_response(struct ieee80211_sub_if_data *sdata,
        memcpy(nullfunc->addr2, sdata->vif.addr, ETH_ALEN);
        memcpy(nullfunc->addr3, sdata->vif.addr, ETH_ALEN);
 
+       skb->priority = tid;
+       skb_set_queue_mapping(skb, ieee802_1d_to_ac[tid]);
        if (qos) {
-               skb->priority = tid;
-
-               skb_set_queue_mapping(skb, ieee802_1d_to_ac[tid]);
-
                nullfunc->qos_ctrl = cpu_to_le16(tid);
 
                if (reason == IEEE80211_FRAME_RELEASE_UAPSD)