diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-07-26 15:11:27 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-07-26 15:11:27 +0000 |
| commit | d0cea742bba78d9c0a86052e895f0a77023126c7 (patch) | |
| tree | a68f582cf247e0ed5e28ae949b286b405a9905b0 | |
| parent | 20d62f8e5fcfe4d6f3c707214df5bd0e5eef1a67 (diff) | |
| download | upstream-d0cea742bba78d9c0a86052e895f0a77023126c7.tar.gz upstream-d0cea742bba78d9c0a86052e895f0a77023126c7.tar.bz2 upstream-d0cea742bba78d9c0a86052e895f0a77023126c7.zip | |
mac80211: merge a few pending fixes for channel switch handling
SVN-Revision: 27783
| -rw-r--r-- | package/mac80211/patches/300-pending_work.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch index 7e3160a1db..f2e4fdb445 100644 --- a/package/mac80211/patches/300-pending_work.patch +++ b/package/mac80211/patches/300-pending_work.patch @@ -1116,3 +1116,31 @@ {0x000081ec, 0x00000000}, {0x000081f0, 0x00000000}, {0x000081f4, 0x00000000}, +--- a/net/mac80211/work.c ++++ b/net/mac80211/work.c +@@ -1075,14 +1075,13 @@ static void ieee80211_work_work(struct w + continue; + if (wk->chan != local->tmp_channel) + continue; +- if (ieee80211_work_ct_coexists(wk->chan_type, +- local->tmp_channel_type)) ++ if (!ieee80211_work_ct_coexists(wk->chan_type, ++ local->tmp_channel_type)) + continue; + remain_off_channel = true; + } + + if (!remain_off_channel && local->tmp_channel) { +- bool on_oper_chan = ieee80211_cfg_on_oper_channel(local); + local->tmp_channel = NULL; + /* If tmp_channel wasn't operating channel, then + * we need to go back on-channel. +@@ -1092,7 +1091,7 @@ static void ieee80211_work_work(struct w + * we still need to do a hardware config. Currently, + * we cannot be here while scanning, however. + */ +- if (ieee80211_cfg_on_oper_channel(local) && !on_oper_chan) ++ if (!ieee80211_cfg_on_oper_channel(local)) + ieee80211_hw_config(local, 0); + + /* At the least, we need to disable offchannel_ps, |