---

yaml --- r: 289999 b: refs/heads/master c: f1e3be1 h: refs/heads/master i: 289997: 2bbf9cf 289995: 818b5a5 289991: 594e054 289983: 85c143d v: v3
git-mirror · Jan 27, 2012 · 74443ff · 74443ff
1 parent af0ae07
commit 74443ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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)