aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-09-14 21:13:01 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-09-14 21:13:01 +0000
commit9c2cfd7a1bfc67cc12e08160d9808f39fd68e318 (patch)
tree3df2de266167c28746abec5a1e34b10c08256ab8 /package
parent2c848d33a99fa55a9cae4d3c6dd89b7ee93bd70c (diff)
downloadupstream-9c2cfd7a1bfc67cc12e08160d9808f39fd68e318.tar.gz
upstream-9c2cfd7a1bfc67cc12e08160d9808f39fd68e318.tar.bz2
upstream-9c2cfd7a1bfc67cc12e08160d9808f39fd68e318.zip
mac80211: add a pending fix for a locking error in the aggregation reorder release code
SVN-Revision: 23060
Diffstat (limited to 'package')
-rw-r--r--package/mac80211/patches/300-mac80211_release_reorder_fix.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/package/mac80211/patches/300-mac80211_release_reorder_fix.patch b/package/mac80211/patches/300-mac80211_release_reorder_fix.patch
new file mode 100644
index 0000000000..a42d7ec13a
--- /dev/null
+++ b/package/mac80211/patches/300-mac80211_release_reorder_fix.patch
@@ -0,0 +1,25 @@
+[PATCH] mac80211: hoist sta->lock from reorder release timer
+
+The patch "mac80211: AMPDU rx reorder timeout timer" clashes
+with "mac80211: use netif_receive_skb in ieee80211_rx callpath"
+
+The timer itself is part of the station's private struct and
+it gets killed whenever the station is removed. Therefore
+the extra sta->lock protection (that can interferes with the
+tx path) is not necessary.
+
+Reported-by: Ming Lei <tom.leiming@gmail.com>
+Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
+---
+--- a/net/mac80211/agg-rx.c
++++ b/net/mac80211/agg-rx.c
+@@ -129,9 +129,7 @@ static void sta_rx_agg_reorder_timer_exp
+ timer_to_tid[0]);
+
+ rcu_read_lock();
+- spin_lock(&sta->lock);
+ ieee80211_release_reorder_timeout(sta, *ptid);
+- spin_unlock(&sta->lock);
+ rcu_read_unlock();
+ }
+