diff options
| author | David S. Miller <davem@davemloft.net> | 2019-04-29 18:00:58 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-29 18:00:58 +0300 |
| commit | 2ae7a39770c734efb04daef6ffca233101ed7c22 (patch) | |
| tree | 046db19097aab564e052bb5e093f8176e0072cd1 /net/mac80211/iface.c | |
| parent | 21f1b8a6636c4dbde4aa1ec0343f42eaf653ffcc (diff) | |
| parent | 517879147493a5e1df6b89a50f708f1133fcaddb (diff) | |
| download | linux-2ae7a39770c734efb04daef6ffca233101ed7c22.tar.xz | |
Merge tag 'mac80211-for-davem-2019-04-26' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
* fix use-after-free in mac80211 TXQs
* fix RX STBC byte order
* fix debugfs rename crashing due to ERR_PTR()
* fix missing regulatory notification
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 4a6ff1482a9f..02d2e6f11e93 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -1908,6 +1908,9 @@ void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata) list_del_rcu(&sdata->list); mutex_unlock(&sdata->local->iflist_mtx); + if (sdata->vif.txq) + ieee80211_txq_purge(sdata->local, to_txq_info(sdata->vif.txq)); + synchronize_rcu(); if (sdata->dev) { |