Commit eaa7af2a authored by Eliad Peller's avatar Eliad Peller Committed by John W. Linville

mac80211: fix remain_off_channel regression

The offchannel code is currently broken - we should
remain_off_channel if the work was started, and
the work's channel and channel_type are the same
as local->tmp_channel and local->tmp_channel_type.

However, if wk->chan_type and local->tmp_channel_type
coexist (e.g. have the same channel type), we won't
remain_off_channel.

This behavior was introduced by commit da2fd1f0
("mac80211: Allow work items to use existing
channel type.")
Tested-by: default avatarBen Greear <greearb@candelatech.com>
Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Cc: stable@kernel.org # 2.6.39+
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 91ae4d02
...@@ -1084,8 +1084,8 @@ static void ieee80211_work_work(struct work_struct *work) ...@@ -1084,8 +1084,8 @@ static void ieee80211_work_work(struct work_struct *work)
continue; continue;
if (wk->chan != local->tmp_channel) if (wk->chan != local->tmp_channel)
continue; continue;
if (ieee80211_work_ct_coexists(wk->chan_type, if (!ieee80211_work_ct_coexists(wk->chan_type,
local->tmp_channel_type)) local->tmp_channel_type))
continue; continue;
remain_off_channel = true; remain_off_channel = true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment