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

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

mac80211: Creating new IBSS with fixed BSSID 



This fixes a bug when creating a new IBSS network with a
fixed BSSID. The fixed BSSID situation is now with one of
my last patches handled in ieee80211_sta_find_ibss()
function.

It's more robust to test against
(ifsta->flags & IEEE80211_STA_PREV_BSSID_SET), because
ifsta->state is not seted right in every situation and so
the creating of the new IBSS network sometimes hangs after
the first try to scan for a network to merge.

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

net/mac80211/mlme.c

+2 −3
Original line number Diff line number Diff line
@@ -2722,9 +2722,8 @@ void ieee80211_mlme_notify_scan_completed(struct ieee80211_local *local) 


	if (sdata && sdata->vif.type == NL80211_IFTYPE_ADHOC) {

		ifsta = &sdata->u.sta;

		if (!(ifsta->flags & IEEE80211_STA_BSSID_SET) ||

		    (!(ifsta->state == IEEE80211_STA_MLME_IBSS_JOINED) &&

		    !ieee80211_sta_active_ibss(sdata)))

		if ((!(ifsta->flags & IEEE80211_STA_PREV_BSSID_SET)) ||

		    !ieee80211_sta_active_ibss(sdata))

			ieee80211_sta_find_ibss(sdata, ifsta);

	}