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

Commit c37a54ac authored by Maital Hahn's avatar Maital Hahn Committed by Johannes Berg
Browse files

mac80211: mesh: flush stations before beacons are stopped 



Some drivers (e.g. wl18xx) expect that the last stage in the
de-initialization process will be stopping the beacons, similar to AP flow.
Update ieee80211_stop_mesh() flow accordingly.
As peers can be removed dynamically, this would not impact other drivers.

Tested also on Ralink RT3572 chipset.

Signed-off-by: default avatarMaital Hahn <maitalm@ti.com>
Signed-off-by: default avatarYaniv Machani <yanivma@ti.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 4e3f21bc

net/mac80211/mesh.c

+6 −4
Original line number Diff line number Diff line
@@ -881,20 +881,22 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata) 


	netif_carrier_off(sdata->dev);



	/* flush STAs and mpaths on this iface */

	sta_info_flush(sdata);

	mesh_path_flush_by_iface(sdata);



	/* stop the beacon */

	ifmsh->mesh_id_len = 0;

	sdata->vif.bss_conf.enable_beacon = false;

	clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED, &sdata->state);

	ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);



	/* remove beacon */

	bcn = rcu_dereference_protected(ifmsh->beacon,

					lockdep_is_held(&sdata->wdev.mtx));

	RCU_INIT_POINTER(ifmsh->beacon, NULL);

	kfree_rcu(bcn, rcu_head);



	/* flush STAs and mpaths on this iface */

	sta_info_flush(sdata);

	mesh_path_flush_by_iface(sdata);



	/* free all potentially still buffered group-addressed frames */

	local->total_ps_buffered -= skb_queue_len(&ifmsh->ps.bc_buf);

	skb_queue_purge(&ifmsh->ps.bc_buf);