From 649e766a64a0d001f040dfc225c601b3d0af6f40 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 2 Feb 2017 12:02:22 +0100 Subject: mac80211: update to wireless-testing 2017-01-31 Signed-off-by: Felix Fietkau --- ...1-fix-up-mismerge-of-ieee80211_tx_dequeue.patch | 35 ---------------------- 1 file changed, 35 deletions(-) delete mode 100644 package/kernel/mac80211/patches/318-mac80211-fix-up-mismerge-of-ieee80211_tx_dequeue.patch (limited to 'package/kernel/mac80211/patches/318-mac80211-fix-up-mismerge-of-ieee80211_tx_dequeue.patch') diff --git a/package/kernel/mac80211/patches/318-mac80211-fix-up-mismerge-of-ieee80211_tx_dequeue.patch b/package/kernel/mac80211/patches/318-mac80211-fix-up-mismerge-of-ieee80211_tx_dequeue.patch deleted file mode 100644 index 2e742e4..0000000 --- a/package/kernel/mac80211/patches/318-mac80211-fix-up-mismerge-of-ieee80211_tx_dequeue.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Bob Copeland -Date: Wed, 12 Oct 2016 08:24:54 -0400 -Subject: [PATCH] mac80211: fix up mismerge of ieee80211_tx_dequeue - -Looks like this spinlock wound up on the wrong side of the -linearize, and I also lost the part that re-enters the loop. -Fix up to match mac80211-next. - -Signed-off-by: Bob Copeland ---- - ---- a/net/mac80211/tx.c -+++ b/net/mac80211/tx.c -@@ -3457,17 +3457,17 @@ begin: - skb_queue_splice_tail(&tx.skbs, &txqi->frags); - } - --out: -- spin_unlock_bh(&fq->lock); -- - if (skb && skb_has_frag_list(skb) && - !ieee80211_hw_check(&local->hw, TX_FRAG_LIST)) { - if (skb_linearize(skb)) { - ieee80211_free_txskb(&local->hw, skb); -- return NULL; -+ goto begin; - } - } - -+out: -+ spin_unlock_bh(&fq->lock); -+ - return skb; - } - EXPORT_SYMBOL(ieee80211_tx_dequeue); -- cgit v1.1