1 files changed, 16 insertions, 2 deletions

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index c9e325d2e120..e1cb22c16530 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -977,7 +977,11 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
         if (sdata->vif.txq) {
                 struct txq_info *txqi = to_txq_info(sdata->vif.txq);
 
+                spin_lock_bh(&txqi->queue.lock);
                 ieee80211_purge_tx_queue(&local->hw, &txqi->queue);
+                txqi->byte_cnt = 0;
+                spin_unlock_bh(&txqi->queue.lock);
+
                 atomic_set(&sdata->txqs_len[txqi->txq.ac], 0);
         }
 
@@ -1271,6 +1275,16 @@ static void ieee80211_iface_work(struct work_struct *work)
                                 }
                         }
                         mutex_unlock(&local->sta_mtx);
+                } else if (ieee80211_is_action(mgmt->frame_control) &&
+                           mgmt->u.action.category == WLAN_CATEGORY_VHT) {
+                        switch (mgmt->u.action.u.vht_group_notif.action_code) {
+                        case WLAN_VHT_ACTION_GROUPID_MGMT:
+                                ieee80211_process_mu_groups(sdata, mgmt);
+                                break;
+                        default:
+                                WARN_ON(1);
+                                break;
+                        }
                 } else if (ieee80211_is_data_qos(mgmt->frame_control)) {
                         struct ieee80211_hdr *hdr = (void *)mgmt;
                         /*
@@ -1747,7 +1761,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
 
                 ret = dev_alloc_name(ndev, ndev->name);
                 if (ret < 0) {
-                        free_netdev(ndev);
+                        ieee80211_if_free(ndev);
                         return ret;
                 }
 
@@ -1833,7 +1847,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
 
                 ret = register_netdevice(ndev);
                 if (ret) {
-                        free_netdev(ndev);
+                        ieee80211_if_free(ndev);
                         return ret;
                 }
         }