---

yaml --- r: 214877 b: refs/heads/master c: 8d4780e h: refs/heads/master i: 214875: 9fcb3c5 v: v3
git-mirror · Sep 28, 2010 · 0518fda · 0518fda
1 parent 573325e
commit 0518fda
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d99bf6e707444af4df294f54a679f679018d7ec3
+refs/heads/master: 8d4780eb1ece4e8109b4f6b2e5e61f7fc593c3f4
diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c
@@ -110,7 +110,8 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
 		chan = scan_chan;
 		channel_type = NL80211_CHAN_NO_HT;
 		local->hw.conf.flags |= IEEE80211_CONF_OFFCHANNEL;
-	} else if (local->tmp_channel) {
+	} else if (local->tmp_channel &&
+		   local->oper_channel != local->tmp_channel) {
 		chan = scan_chan = local->tmp_channel;
 		channel_type = local->tmp_channel_type;
 		local->hw.conf.flags |= IEEE80211_CONF_OFFCHANNEL;