From: Johannes Berg Date: Wed, 22 Jan 2014 09:08:57 +0000 (+0100) Subject: mac80211: use sdata mesh_id_len instead of wdev's X-Git-Tag: firefly_0821_release~176^2~4167^2~18^2^2~47^2~83 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1693d34416a4b07e291578b4b87dc811876046cf;p=firefly-linux-kernel-4.4.55.git 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: Johannes Berg --- diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index b02ac3378b13..836ec014eb58 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -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 &&