summaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/310-mac80211_sw_scan_fix.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-10 12:08:52 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-10 12:08:52 +0000
commit4271764a5b431d9434cdc81b8f9b0d90cc77f753 (patch)
treecfc80b4d29f9ef93c4086c63f3fd399327664e87 /package/mac80211/patches/310-mac80211_sw_scan_fix.patch
parent0f5c5eec591e0a7381d769e166abd4644d86e993 (diff)
mac80211: update to a newer compat-wireless which fixes rt2800pci compile issues on 2.6.32 and below
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23374 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/310-mac80211_sw_scan_fix.patch')
-rw-r--r--package/mac80211/patches/310-mac80211_sw_scan_fix.patch33
1 files changed, 0 insertions, 33 deletions
diff --git a/package/mac80211/patches/310-mac80211_sw_scan_fix.patch b/package/mac80211/patches/310-mac80211_sw_scan_fix.patch
deleted file mode 100644
index 0375780da..000000000
--- a/package/mac80211/patches/310-mac80211_sw_scan_fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Johannes Berg <johannes.berg@intel.com>
-
-The recent scan overhaul broke locking
-because now we can jump to code that
-attempts to unlock, while we don't have
-the mutex held. Fix this by holding the
-mutex around all the relevant code.
-
-Reported-by: Ben Greear <greearb@candelatech.com>
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
----
- net/mac80211/scan.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
---- a/net/mac80211/scan.c
-+++ b/net/mac80211/scan.c
-@@ -686,8 +686,6 @@ void ieee80211_scan_work(struct work_str
- goto out_complete;
- }
-
-- mutex_unlock(&local->mtx);
--
- /*
- * as long as no delay is required advance immediately
- * without scheduling a new work
-@@ -718,6 +716,7 @@ void ieee80211_scan_work(struct work_str
- } while (next_delay == 0);
-
- ieee80211_queue_delayed_work(&local->hw, &local->scan_work, next_delay);
-+ mutex_unlock(&local->mtx);
- return;
-
- out_complete: