---

yaml --- r: 327671 b: refs/heads/master c: 9b86487 h: refs/heads/master i: 327669: 04bec01 327667: 1221ae6 327663: 12af1a4 v: v3
git-mirror · Aug 20, 2012 · 7e80a7f · 7e80a7f
1 parent f289ff4
commit 7e80a7f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -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;