Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Three trivial overlapping conflicts. Signed-off-by: David S. Miller <davem@davemloft.net>
2019-05-02 22:14:21 -04:00
parent 26f146ed97 ea9866793d
commit ff24e4980a
167 changed files with 1378 additions and 730 deletions
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@ -1907,6 +1907,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) {