From: Johannes Berg Date: Thu, 13 Oct 2011 11:19:19 +0000 (+0200) Subject: mac80211: fix TID for null poll response X-Git-Tag: upstream/snapshot3+hdmi~8889^2~83^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=59b66255bc7804970098533ce7c9bf6967f35f62;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git mac80211: fix TID for null poll response 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 Signed-off-by: John W. Linville --- diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 076593b..2e2c711 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -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)