summaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/540-mac80211_work_fix.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-07 19:15:05 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-07 19:15:05 +0000
commitc3a643f552f4d3a15e17f08eddb616086cc34157 (patch)
tree1c14141ec4e838be42de26b9cf0074758f2439c9 /package/mac80211/patches/540-mac80211_work_fix.patch
parent2e7da1b948f9bf1946f992e7bafe27b913798367 (diff)
mac80211: update to compat-wireless 2010-01-07 (unoffical snapshot, official ones are not working yet)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19063 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/540-mac80211_work_fix.patch')
-rw-r--r--package/mac80211/patches/540-mac80211_work_fix.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/package/mac80211/patches/540-mac80211_work_fix.patch b/package/mac80211/patches/540-mac80211_work_fix.patch
new file mode 100644
index 000000000..339a52d51
--- /dev/null
+++ b/package/mac80211/patches/540-mac80211_work_fix.patch
@@ -0,0 +1,30 @@
+--- a/net/mac80211/scan.c
++++ b/net/mac80211/scan.c
+@@ -284,6 +284,7 @@ void ieee80211_scan_completed(struct iee
+ ieee80211_mlme_notify_scan_completed(local);
+ ieee80211_ibss_notify_scan_completed(local);
+ ieee80211_mesh_notify_scan_completed(local);
++ ieee80211_queue_work(&local->hw, &local->work_work);
+ }
+ EXPORT_SYMBOL(ieee80211_scan_completed);
+
+--- a/net/mac80211/work.c
++++ b/net/mac80211/work.c
+@@ -818,6 +818,7 @@ static void ieee80211_work_work(struct w
+ wk->chan == local->tmp_channel &&
+ wk->chan_type == local->tmp_channel_type) {
+ wk->started = true;
++ wk->timeout = jiffies;
+ }
+
+ if (!wk->started && !local->tmp_channel) {
+@@ -935,6 +936,9 @@ void ieee80211_add_work(struct ieee80211
+ if (WARN_ON(!wk->done))
+ return;
+
++ if (WARN_ON(!ieee80211_sdata_running(wk->sdata)))
++ return;
++
+ wk->started = false;
+
+ local = wk->sdata->local;