From 74443ff6c73b1cc7f4893c7f8b7a0515cf583eec Mon Sep 17 00:00:00 2001
From: Nicolas Cavallari <Nicolas.Cavallari@lri.fr>
Date: Thu, 26 Jan 2012 13:36:34 +0100
Subject: [PATCH] --- yaml --- r: 289999 b: refs/heads/master c:
 f1e3be1561c43b6bbe2426e34849fb1486dc313b h: refs/heads/master i:   289997:
 2bbf9cf9bf183384c2bdc44bc149b8f3e8d6ad07   289995:
 818b5a5df66658d3fcd938b6bf0bbe501c93dc9b   289991:
 594e054d4dcacd883d8388ee7ad09dd2b49bb30f   289983:
 85c143d0b3bf19d51c1e6202e46c5c0542ba0de7 v: v3

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

diff --git a/[refs] b/[refs]
index 115684d70309..be32b97c1a79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e1b1b246096fe04467f928973487fa47afaf2cc
+refs/heads/master: f1e3be1561c43b6bbe2426e34849fb1486dc313b
diff --git a/trunk/net/mac80211/ibss.c b/trunk/net/mac80211/ibss.c
index d38baa41cf6c..93b3c7298be3 100644
--- a/trunk/net/mac80211/ibss.c
+++ b/trunk/net/mac80211/ibss.c
@@ -655,14 +655,15 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata)
 	if (ieee80211_sta_active_ibss(sdata))
 		return;
 
-	if (ifibss->fixed_channel)
+	if (ifibss->fixed_bssid)
 		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, NULL);
+			ifibss->ssid, ifibss->ssid_len,
+			ifibss->fixed_channel ? ifibss->channel : NULL);
 }
 
 static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)