3 files changed, 7 insertions, 3 deletions

diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c
index cff0fb3578c9..deb3faf08337 100644
--- a/net/mac80211/debugfs_netdev.c
+++ b/net/mac80211/debugfs_netdev.c
@@ -841,7 +841,7 @@ void ieee80211_debugfs_rename_netdev(struct ieee80211_sub_if_data *sdata)
 
         dir = sdata->vif.debugfs_dir;
 
-        if (!dir)
+        if (IS_ERR_OR_NULL(dir))
                 return;
 
         sprintf(buf, "netdev:%s", sdata->name);
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
index e03c46ac8e4d..c62101857b9b 100644
--- a/net/mac80211/ht.c
+++ b/net/mac80211/ht.c
@@ -112,8 +112,9 @@ void ieee80211_apply_htcap_overrides(struct ieee80211_sub_if_data *sdata,
                              IEEE80211_HT_CAP_TX_STBC);
 
         /* Allow user to configure RX STBC bits */
-        if (ht_capa_mask->cap_info & IEEE80211_HT_CAP_RX_STBC)
-                ht_cap->cap |= ht_capa->cap_info & IEEE80211_HT_CAP_RX_STBC;
+        if (ht_capa_mask->cap_info & cpu_to_le16(IEEE80211_HT_CAP_RX_STBC))
+                ht_cap->cap |= le16_to_cpu(ht_capa->cap_info) &
+                                        IEEE80211_HT_CAP_RX_STBC;
 
         /* Allow user to decrease AMPDU factor */
         if (ht_capa_mask->ampdu_params_info &
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 94459b2b3d2a..410685d38c46 100644
--- 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) {