diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-10-30 15:17:56 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-10-30 15:17:56 +0000 |
commit | d2dc5092764d32155c95b8358903d1a88de47231 (patch) | |
tree | e7407a762a23a909064b6e4bbb06b2a775a25e00 /package/kernel/mac80211/patches/334-mac80211-fix-tx-sequence-number-assignment-with-soft.patch | |
parent | 27d27caaf4f255a7d99ddeb87c5bd1f2c44477ce (diff) | |
download | master-187ad058-d2dc5092764d32155c95b8358903d1a88de47231.tar.gz master-187ad058-d2dc5092764d32155c95b8358903d1a88de47231.tar.bz2 master-187ad058-d2dc5092764d32155c95b8358903d1a88de47231.zip |
mac80211: update to wireless-testing 2015-10-26
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47286 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/334-mac80211-fix-tx-sequence-number-assignment-with-soft.patch')
-rw-r--r-- | package/kernel/mac80211/patches/334-mac80211-fix-tx-sequence-number-assignment-with-soft.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/package/kernel/mac80211/patches/334-mac80211-fix-tx-sequence-number-assignment-with-soft.patch b/package/kernel/mac80211/patches/334-mac80211-fix-tx-sequence-number-assignment-with-soft.patch deleted file mode 100644 index b19e7ee851..0000000000 --- a/package/kernel/mac80211/patches/334-mac80211-fix-tx-sequence-number-assignment-with-soft.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Felix Fietkau <nbd@openwrt.org> -Date: Thu, 24 Sep 2015 14:10:07 +0200 -Subject: [PATCH] mac80211: fix tx sequence number assignment with software - queue + fast-xmit - -When using software queueing, tx sequence number assignment happens at -ieee80211_tx_dequeue time, so the fast-xmit codepath must not do that. - -Signed-off-by: Felix Fietkau <nbd@openwrt.org> ---- - ---- a/net/mac80211/tx.c -+++ b/net/mac80211/tx.c -@@ -2766,7 +2766,8 @@ static bool ieee80211_xmit_fast(struct i - - if (hdr->frame_control & cpu_to_le16(IEEE80211_STYPE_QOS_DATA)) { - *ieee80211_get_qos_ctl(hdr) = tid; -- hdr->seq_ctrl = ieee80211_tx_next_seq(sta, tid); -+ if (!sta->sta.txq[0]) -+ hdr->seq_ctrl = ieee80211_tx_next_seq(sta, tid); - } else { - info->flags |= IEEE80211_TX_CTL_ASSIGN_SEQ; - hdr->seq_ctrl = cpu_to_le16(sdata->sequence_number); |