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

Commit 49b5c7f4 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: tell driver about IBSS merge 



My previous patch "mac80211: notify driver about
IBSS status" left a problem -- when we merge with
a new BSSID, we never tell the driver that we left
the old one. Fix that.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent edfcba15

net/mac80211/ibss.c

+6 −0
Original line number Diff line number Diff line
@@ -91,6 +91,12 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, 
	if (memcmp(ifibss->bssid, bssid, ETH_ALEN))

		sta_info_flush(sdata->local, sdata);



	/* if merging, indicate to driver that we leave the old IBSS */

	if (sdata->vif.bss_conf.ibss_joined) {

		sdata->vif.bss_conf.ibss_joined = false;

		ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_IBSS);

	}



	memcpy(ifibss->bssid, bssid, ETH_ALEN);



	sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0;