summaryrefslogtreecommitdiff
path: root/net/mac80211/mesh.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2014-01-22 13:08:57 +0400
committerJohannes Berg <johannes.berg@intel.com>2014-02-05 00:48:17 +0400
commit1693d34416a4b07e291578b4b87dc811876046cf (patch)
tree753b24aead1e099ab80eff08ada3b0092c8b83e5 /net/mac80211/mesh.c
parent80e207c32bff0f9e990f4ff629c809bd20c7950a (diff)
downloadlinux-1693d34416a4b07e291578b4b87dc811876046cf.tar.xz
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 <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mesh.c')
-rw-r--r--net/mac80211/mesh.c4
1 files changed, 2 insertions, 2 deletions
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 &&