]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
mac80211: fix remain_off_channel regression
authorEliad Peller <eliad@wizery.com>
Thu, 20 Oct 2011 17:05:49 +0000 (19:05 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 2 Nov 2011 19:23:11 +0000 (15:23 -0400)
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>
Cc: stable@kernel.org # 2.6.39+
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/work.c

index 94472eb34d76452acfddfb624eba7e44f46e3445..bf5be22a977c853977822dfbb9327f5d2b56783c 100644 (file)
@@ -1084,8 +1084,8 @@ 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;
        }