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 | fe32f100a8cd9fd6f65d74632a0cdc9fb57c2dd9 (patch) | |
tree | bf23be761a1a1f263cc95903ce34be26489fdc03 /package/mac80211/patches/540-mac80211_work_fix.patch | |
parent | c97341b7614c25b30f19856e300718114ab1435f (diff) | |
download | upstream-fe32f100a8cd9fd6f65d74632a0cdc9fb57c2dd9.tar.gz upstream-fe32f100a8cd9fd6f65d74632a0cdc9fb57c2dd9.tar.bz2 upstream-fe32f100a8cd9fd6f65d74632a0cdc9fb57c2dd9.zip |
mac80211: update to compat-wireless 2010-01-07 (unoffical snapshot, official ones are not working yet)
SVN-Revision: 19063
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; |