diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-01-07 19:15:05 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-01-07 19:15:05 +0000 |
| commit | a2c0f039a9d32bbb9c8b4a472fafbf3cb7f8ca0f (patch) | |
| tree | 1c14141ec4e838be42de26b9cf0074758f2439c9 /package/mac80211/patches/540-mac80211_work_fix.patch | |
| parent | dee16bb67ae841d8340492b7ce99155886d2dca1 (diff) | |
| download | upstream-a2c0f039a9d32bbb9c8b4a472fafbf3cb7f8ca0f.tar.gz upstream-a2c0f039a9d32bbb9c8b4a472fafbf3cb7f8ca0f.tar.bz2 upstream-a2c0f039a9d32bbb9c8b4a472fafbf3cb7f8ca0f.zip | |
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.patch | 30 |
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 0000000000..339a52d51d --- /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; |