From: John W. Linville Date: Mon, 30 Jan 2012 20:28:11 +0000 (-0500) Subject: Revert "mac80211: Do not scan for IBSS merge with a fixed BSSID." X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c037b8367c7e2b775a99d74037f5df014d2fbf06;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git Revert "mac80211: Do not scan for IBSS merge with a fixed BSSID." This reverts commit f1e3be1561c43b6bbe2426e34849fb1486dc313b. Johannes Berg thinks that this patch is incorrect. I'll defer to his judgment. Signed-off-by: John W. Linville --- diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 93b3c7298be3..d38baa41cf6c 100644 --- a/net/mac80211/ibss.c +++ b/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)