---

yaml --- r: 289938 b: refs/heads/master c: 39d02a7 h: refs/heads/master v: v3
git-mirror · Jan 24, 2012 · a08de91 · a08de91
1 parent b4b2173
commit a08de91
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb4961dbc27d40cdbed297aa9bd74fa4a0e2ba6c
+refs/heads/master: 39d02a7d90602d4557ee05db2a157a4e0ec3a3d3
diff --git a/trunk/net/mac80211/ibss.c b/trunk/net/mac80211/ibss.c
@@ -642,8 +642,7 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata)
 	       "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)