| From eaa7af2ae582c9a8c51b374c48d5970b748a5ce2 Mon Sep 17 00:00:00 2001 |
| From: Eliad Peller <eliad@wizery.com> |
| Date: Thu, 20 Oct 2011 19:05:49 +0200 |
| Subject: mac80211: fix remain_off_channel regression |
| |
| From: Eliad Peller <eliad@wizery.com> |
| |
| commit eaa7af2ae582c9a8c51b374c48d5970b748a5ce2 upstream. |
| |
| 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 da2fd1f |
| ("mac80211: Allow work items to use existing |
| channel type.") |
| |
| Tested-by: Ben Greear <greearb@candelatech.com> |
| Signed-off-by: Eliad Peller <eliad@wizery.com> |
| Signed-off-by: John W. Linville <linville@tuxdriver.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| net/mac80211/work.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/net/mac80211/work.c |
| +++ b/net/mac80211/work.c |
| @@ -1086,8 +1086,8 @@ 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; |
| } |
