From: Eliad Peller Date: Thu, 20 Oct 2011 17:05:49 +0000 (+0200) Subject: mac80211: fix remain_off_channel regression X-Git-Tag: v3.2-rc1~4^2~24^2^2~12 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaa7af2ae582c9a8c51b374c48d5970b748a5ce2;p=pandora-kernel.git 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 da2fd1f ("mac80211: Allow work items to use existing channel type.") Tested-by: Ben Greear Signed-off-by: Eliad Peller Cc: stable@kernel.org # 2.6.39+ Signed-off-by: John W. Linville --- Reading git-diff-tree failed