Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 137f9f46 authored by Alina Friedrichsen's avatar Alina Friedrichsen Committed by John W. Linville
Browse files

mac80211: Don't scan if BSSID and channel are set manually 



If you set a fixed BSSID and channel it's not necessary to scan for
neighbors to merge, because you really don't want to merge with it. So
don't do it.

Signed-off-by: default avatarAlina Friedrichsen <x-alina@gmx.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0efcdfd6

net/mac80211/mlme.c

+4 −0
Original line number Diff line number Diff line
@@ -2009,6 +2009,10 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata, 
	if (ieee80211_sta_active_ibss(sdata))

		return;



	if ((sdata->u.sta.flags & IEEE80211_STA_BSSID_SET) &&

	    (!(sdata->u.sta.flags & IEEE80211_STA_AUTO_CHANNEL_SEL)))

		return;



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

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

	ieee80211_request_scan(sdata, ifsta->ssid, ifsta->ssid_len);