From 0518fdabb7c71693df722e22cc51b465da99901d Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Fri, 24 Sep 2010 21:59:57 -0400 Subject: [PATCH] --- yaml --- r: 214877 b: refs/heads/master c: 8d4780eb1ece4e8109b4f6b2e5e61f7fc593c3f4 h: refs/heads/master i: 214875: 9fcb3c5bbd1804f3536bf455dec6a87a5cef51f5 v: v3 --- [refs] | 2 +- trunk/net/mac80211/main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c1c60abba682..c3602386735b 100644 --- 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 index 7c8542627351..e24fa5be4264 100644 --- 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;