diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-09-14 21:13:01 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-09-14 21:13:01 +0000 |
| commit | 73c920ee4f6252e5d5b0ad751c1c67c57d2aa735 (patch) | |
| tree | 838c2277a9aa92427e3518005dcf7f3639aa975e | |
| parent | ee7d78d7abb4ee5149793fffa8ed5a5d746d892d (diff) | |
| download | upstream-73c920ee4f6252e5d5b0ad751c1c67c57d2aa735.tar.gz upstream-73c920ee4f6252e5d5b0ad751c1c67c57d2aa735.tar.bz2 upstream-73c920ee4f6252e5d5b0ad751c1c67c57d2aa735.zip | |
mac80211: add a pending fix for a locking error in the aggregation reorder release code
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23060 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/mac80211/patches/300-mac80211_release_reorder_fix.patch | 25 |
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(); + } + |