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

Commit 1693d344 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: use sdata mesh_id_len instead of wdev's 



Since we copy the mesh_id_len into our own data structures,
use it consistently and don't sometimes use cfg80211's copy.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 80e207c3

net/mac80211/mesh.c

+2 −2
Original line number Diff line number Diff line
@@ -1216,7 +1216,7 @@ void ieee80211_mesh_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, 
	sdata_lock(sdata);



	/* mesh already went down */

	if (!sdata->wdev.mesh_id_len)

	if (!sdata->u.mesh.mesh_id_len)

		goto out;



	rx_status = IEEE80211_SKB_RXCB(skb);
@@ -1269,7 +1269,7 @@ void ieee80211_mesh_work(struct ieee80211_sub_if_data *sdata) 
	sdata_lock(sdata);



	/* mesh already went down */

	if (!sdata->wdev.mesh_id_len)

	if (!sdata->u.mesh.mesh_id_len)

		goto out;



	if (ifmsh->preq_queue_len &&