| commit | 632abf8b3f714da01daec2d43ffd9cd7b47f53a9 | |
| author | Eliad Peller <eliad@wizery.com> | |
| Thu, 20 Oct 2011 17:05:49 +0000 (20 19:05 +0200) | ||
| committer | Greg Kroah-Hartman <gregkh@suse.de> | |
| Fri, 11 Nov 2011 17:37:12 +0000 (11 09:37 -0800) | ||
| tree | 01ba73ef955158ccc6a38d02364f44b90e512fea | treesnapshot (tar.gz zip) |
| parent | 1cc8631784f67c62a8309897f7d4cb885a05ed6f | commitdiff |
mac80211: fix remain_off_channel regression
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>
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 | diffblobblamehistory |