From e26d5a560131797d95c8c66a61a7b143287bf24a Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Thu, 29 Sep 2011 16:04:41 +0200 Subject: [PATCH] --- yaml --- r: 266531 b: refs/heads/master c: 49a59543eb5a5d268b3d11747f9c3c557ae271a0 h: refs/heads/master i: 266529: 24d33d0dd79f0e0c786de408a14880a790d9f31b 266527: d0c626cde682887cd07ab8c68f40e6ab994c3818 v: v3 --- [refs] | 2 +- trunk/net/mac80211/tx.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 64d7a4e421c0..505ed8c368ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b801bc969364a980c1366e48155d1a29d20661b +refs/heads/master: 49a59543eb5a5d268b3d11747f9c3c557ae271a0 diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c index 7699e666457f..ae5dd85f1e93 100644 --- a/trunk/net/mac80211/tx.c +++ b/trunk/net/mac80211/tx.c @@ -804,6 +804,9 @@ ieee80211_tx_h_sequence(struct ieee80211_tx_data *tx) if (ieee80211_hdrlen(hdr->frame_control) < 24) return TX_CONTINUE; + if (ieee80211_is_qos_nullfunc(hdr->frame_control)) + return TX_CONTINUE; + /* * Anything but QoS data that has a sequence number field * (is long enough) gets a sequence number from the global @@ -1236,6 +1239,7 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata, tx->sta = sta_info_get(sdata, hdr->addr1); if (tx->sta && ieee80211_is_data_qos(hdr->frame_control) && + !ieee80211_is_qos_nullfunc(hdr->frame_control) && (local->hw.flags & IEEE80211_HW_AMPDU_AGGREGATION) && !(local->hw.flags & IEEE80211_HW_TX_AMPDU_SETUP_IN_HW)) { struct tid_ampdu_tx *tid_tx;