diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2011-10-13 13:19:19 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-10-14 14:48:23 -0400 |
| commit | 59b66255bc7804970098533ce7c9bf6967f35f62 (patch) | |
| tree | c52bb7ed41e1bb171939422247a5e7fb7b51eafd | |
| parent | 423e38e8079f8f4fe0bf66d4f9a7d61beb232aca (diff) | |
| download | linux-59b66255bc7804970098533ce7c9bf6967f35f62.tar.gz linux-59b66255bc7804970098533ce7c9bf6967f35f62.tar.bz2 linux-59b66255bc7804970098533ce7c9bf6967f35f62.zip | |
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 <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | net/mac80211/sta_info.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 076593bffbcf..2e2c71194c80 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) |