From d2dc5092764d32155c95b8358903d1a88de47231 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 30 Oct 2015 15:17:56 +0000 Subject: mac80211: update to wireless-testing 2015-10-26 Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47286 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...x-tx-sequence-number-assignment-with-soft.patch | 23 ---------------------- 1 file changed, 23 deletions(-) delete mode 100644 package/kernel/mac80211/patches/334-mac80211-fix-tx-sequence-number-assignment-with-soft.patch (limited to 'package/kernel/mac80211/patches/334-mac80211-fix-tx-sequence-number-assignment-with-soft.patch') 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 -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 ---- - ---- 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); -- cgit v1.2.3