diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-11-09 14:49:23 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-09 14:49:23 -0500 |
| commit | 5e819059a20b0fc5a71875f28b4cae359e38d85a (patch) | |
| tree | b94a18142abc5e60c84f90ee2490e8a6af01c2a9 /net/mac80211/work.c | |
| parent | ae2772b313b98a14f69b5bc67135c9fee48771be (diff) | |
| parent | cc438fccd5783c9f7b4c4858358ac897dcf8a58d (diff) | |
| download | op-kernel-dev-5e819059a20b0fc5a71875f28b4cae359e38d85a.zip op-kernel-dev-5e819059a20b0fc5a71875f28b4cae359e38d85a.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/mac80211/work.c')
| -rw-r--r-- | net/mac80211/work.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/mac80211/work.c b/net/mac80211/work.c index fab5092..30da4e3 100644 --- a/net/mac80211/work.c +++ b/net/mac80211/work.c @@ -1057,14 +1057,13 @@ static void ieee80211_work_work(struct work_struct *work) 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. @@ -1074,7 +1073,7 @@ static void ieee80211_work_work(struct work_struct *work) * 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, |
