From 7e80a7f84a5d81f3068fc86ea0c901abf210d685 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 26 Jul 2012 14:38:32 +0200
Subject: [PATCH] --- yaml --- r: 327671 b: refs/heads/master c:
 9b8648704358e42f9865cd6de7cedb5ac0db67e7 h: refs/heads/master i:   327669:
 04bec01c03610996bd57e7f95a31a7716870a3a3   327667:
 1221ae632c5b62a4951ae679e567102321d3de36   327663:
 12af1a48a4ec553b7070c5c7aa4572f03bb0f6b4 v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/scan.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 8bdc410bcfeb..11153255ac9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4797c7ba93e4049cdda18045c01bbe563aafff69
+refs/heads/master: 9b8648704358e42f9865cd6de7cedb5ac0db67e7
diff --git a/trunk/net/mac80211/scan.c b/trunk/net/mac80211/scan.c
index bcaee5d12839..4b75ddeef6b1 100644
--- a/trunk/net/mac80211/scan.c
+++ b/trunk/net/mac80211/scan.c
@@ -479,11 +479,10 @@ static int __ieee80211_start_scan(struct ieee80211_sub_if_data *sdata,
 	if (local->ops->hw_scan) {
 		__set_bit(SCAN_HW_SCANNING, &local->scanning);
 	} else if ((req->n_channels == 1) &&
-		   (req->channels[0]->center_freq ==
-		    local->hw.conf.channel->center_freq)) {
-
-		/* If we are scanning only on the current channel, then
-		 * we do not need to stop normal activities
+		   (req->channels[0] == local->oper_channel)) {
+		/*
+		 * If we are scanning only on the operating channel
+		 * then we do not need to stop normal activities
 		 */
 		unsigned long next_delay;