From ba33fdd47358a064c831d2f498a311085500c752 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Mon, 30 Jan 2012 15:28:11 -0500
Subject: [PATCH] --- yaml --- r: 290002 b: refs/heads/master c:
 c037b8367c7e2b775a99d74037f5df014d2fbf06 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/ibss.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index df2c62c7c6a2..738b5e2921fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41b2d62702730b0c6bc5a40722e423bb0338311a
+refs/heads/master: c037b8367c7e2b775a99d74037f5df014d2fbf06
diff --git a/trunk/net/mac80211/ibss.c b/trunk/net/mac80211/ibss.c
index 93b3c7298be3..d38baa41cf6c 100644
--- a/trunk/net/mac80211/ibss.c
+++ b/trunk/net/mac80211/ibss.c
@@ -655,15 +655,14 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata)
 	if (ieee80211_sta_active_ibss(sdata))
 		return;
 
-	if (ifibss->fixed_bssid)
+	if (ifibss->fixed_channel)
 		return;
 
 	printk(KERN_DEBUG "%s: No active IBSS STAs - trying to scan for other "
 	       "IBSS networks with same SSID (merge)\n", sdata->name);
 
 	ieee80211_request_internal_scan(sdata,
-			ifibss->ssid, ifibss->ssid_len,
-			ifibss->fixed_channel ? ifibss->channel : NULL);
+			ifibss->ssid, ifibss->ssid_len, NULL);
 }
 
 static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)