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

Commit 65f0e6a3 authored by Alina Friedrichsen's avatar Alina Friedrichsen Committed by John W. Linville
Browse files

mac80211: Don't merge if BSSID is set manually 



If you set a fixed BSSID manually, you never want that the driver
change it back, or your ad-hoc mesh network will break into peaces. 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 137f9f46

net/mac80211/mlme.c

+1 −0
Original line number Diff line number Diff line
@@ -1644,6 +1644,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, 


	/* check if we need to merge IBSS */

	if (sdata->vif.type == NL80211_IFTYPE_ADHOC && beacon &&

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

	    bss->capability & WLAN_CAPABILITY_IBSS &&

	    bss->freq == local->oper_channel->center_freq &&

	    elems->ssid_len == sdata->u.sta.ssid_len &&