Commit c037b836 authored by John W. Linville's avatar John W. Linville
Browse files

Revert "mac80211: Do not scan for IBSS merge with a fixed BSSID." 



This reverts commit f1e3be15.

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

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 41b2d627

net/mac80211/ibss.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -655,15 +655,14 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata) 
	if (ieee80211_sta_active_ibss(sdata))

	if (ieee80211_sta_active_ibss(sdata))

		return;

		return;





	if (ifibss->fixed_bssid)

	if (ifibss->fixed_channel)

		return;

		return;





	printk(KERN_DEBUG "%s: No active IBSS STAs - trying to scan for other "

	printk(KERN_DEBUG "%s: No active IBSS STAs - trying to scan for other "

	       "IBSS networks with same SSID (merge)\n", sdata->name);

	       "IBSS networks with same SSID (merge)\n", sdata->name);





	ieee80211_request_internal_scan(sdata,

	ieee80211_request_internal_scan(sdata,

			ifibss->ssid, ifibss->ssid_len,

			ifibss->ssid, ifibss->ssid_len, NULL);

			ifibss->fixed_channel ? ifibss->channel : NULL);

}

}





static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)

static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)