Revert "mac80211: Do not scan for IBSS merge with a fixed BSSID."
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 30 Jan 2012 20:28:11 +0000 (15:28 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 30 Jan 2012 20:28:11 +0000 (15:28 -0500)
This reverts commit f1e3be1561c43b6bbe2426e34849fb1486dc313b.

Johannes Berg <johannes@sipsolutions.net> thinks that this patch is
incorrect.  I'll defer to his judgment.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/ibss.c

index 93b3c7298be37655aa460e436c658db219c2b437..d38baa41cf6c6a073bf9ed3de8cd81fbb7602d22 100644 (file)
@@ -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)