diff options
| author | David S. Miller <davem@davemloft.net> | 2016-06-02 03:53:19 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-02 03:53:19 +0300 |
| commit | 31843af4dc6acb71c4bd287afe7921c81b0b6fcb (patch) | |
| tree | 9d12473f85c19c9a36a9e9454550d2754f231ded /net | |
| parent | 6b15d6650c5301ce023d8df0cc3a60b1a76d377e (diff) | |
| parent | 6fe04128f158c5ad27e7504bfdf1b12e63331bc9 (diff) | |
| download | linux-31843af4dc6acb71c4bd287afe7921c81b0b6fcb.tar.xz | |
Merge tag 'mac80211-for-davem-2016-06-01' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Three small fixes for the current cycle:
* missing netlink attribute check in hwsim wmediumd (Martin)
* fast xmit structure alignment fix (Felix)
* mesh path flush/synchronisation fix (Bob)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/mesh.c | 4 | ||||
| -rw-r--r-- | net/mac80211/sta_info.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 4c6404e1ad6e..21b1fdf5d01d 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -161,6 +161,10 @@ void mesh_sta_cleanup(struct sta_info *sta) del_timer_sync(&sta->mesh->plink_timer); } + /* make sure no readers can access nexthop sta from here on */ + mesh_path_flush_by_nexthop(sta); + synchronize_net(); + if (changed) ieee80211_mbss_info_change_notify(sdata, changed); } diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index c8b8ccc370eb..78b0ef32dddd 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h @@ -280,7 +280,7 @@ struct ieee80211_fast_tx { u8 sa_offs, da_offs, pn_offs; u8 band; u8 hdr[30 + 2 + IEEE80211_FAST_XMIT_MAX_IV + - sizeof(rfc1042_header)]; + sizeof(rfc1042_header)] __aligned(2); struct rcu_head rcu_head; }; |