Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

6 files changed, 28 insertions, 12 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index e60df48fa4d4..296620d6ca0c 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -791,7 +791,7 @@ static int sta_apply_parameters(struct ieee80211_local *local,
                 if (set & BIT(NL80211_STA_FLAG_AUTHORIZED))
                         ret = sta_info_move_state_checked(sta,
                                         IEEE80211_STA_AUTHORIZED);
-                else
+                else if (test_sta_flag(sta, WLAN_STA_AUTHORIZED))
                         ret = sta_info_move_state_checked(sta,
                                         IEEE80211_STA_ASSOC);
                 if (ret)
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index f407427c642f..751409120769 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1979,6 +1979,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
                 mesh_path_error_tx(ifmsh->mshcfg.element_ttl, fwd_hdr->addr3,
                                     0, reason, fwd_hdr->addr2, sdata);
                 IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, dropped_frames_no_route);
+                kfree_skb(fwd_skb);
                 return RX_DROP_MONITOR;
         }
 
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 3c428d4839c7..ff11f6bf8266 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -238,9 +238,11 @@ static void sta_unblock(struct work_struct *wk)
         if (sta->dead)
                 return;
 
-        if (!test_sta_flag(sta, WLAN_STA_PS_STA))
+        if (!test_sta_flag(sta, WLAN_STA_PS_STA)) {
+                local_bh_disable();
                 ieee80211_sta_ps_deliver_wakeup(sta);
-        else if (test_and_clear_sta_flag(sta, WLAN_STA_PSPOLL)) {
+                local_bh_enable();
+        } else if (test_and_clear_sta_flag(sta, WLAN_STA_PSPOLL)) {
                 clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
 
                 local_bh_disable();
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index edcd1c7ab83f..e05667cd5e76 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1001,8 +1001,6 @@ ieee80211_tx_h_stats(struct ieee80211_tx_data *tx)
 static ieee80211_tx_result debug_noinline
 ieee80211_tx_h_encrypt(struct ieee80211_tx_data *tx)
 {
-        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);
-
         if (!tx->key)
                 return TX_CONTINUE;
 
@@ -1017,13 +1015,7 @@ ieee80211_tx_h_encrypt(struct ieee80211_tx_data *tx)
         case WLAN_CIPHER_SUITE_AES_CMAC:
                 return ieee80211_crypto_aes_cmac_encrypt(tx);
         default:
-                /* handle hw-only algorithm */
-                if (info->control.hw_key) {
-                        ieee80211_tx_set_protected(tx);
-                        return TX_CONTINUE;
-                }
-                break;
-
+                return ieee80211_crypto_hw_encrypt(tx);
         }
 
         return TX_DROP;
diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c
index 422b79851ec5..b758350919ff 100644
--- a/net/mac80211/wpa.c
+++ b/net/mac80211/wpa.c
@@ -643,3 +643,22 @@ ieee80211_crypto_aes_cmac_decrypt(struct ieee80211_rx_data *rx)
 
         return RX_CONTINUE;
 }
+
+ieee80211_tx_result
+ieee80211_crypto_hw_encrypt(struct ieee80211_tx_data *tx)
+{
+        struct sk_buff *skb;
+        struct ieee80211_tx_info *info = NULL;
+
+        skb_queue_walk(&tx->skbs, skb) {
+                info  = IEEE80211_SKB_CB(skb);
+
+                /* handle hw-only algorithm */
+                if (!info->control.hw_key)
+                        return TX_DROP;
+        }
+
+        ieee80211_tx_set_protected(tx);
+
+        return TX_CONTINUE;
+}
diff --git a/net/mac80211/wpa.h b/net/mac80211/wpa.h
index baba0608313e..07e33f899c71 100644
--- a/net/mac80211/wpa.h
+++ b/net/mac80211/wpa.h
@@ -32,5 +32,7 @@ ieee80211_tx_result
 ieee80211_crypto_aes_cmac_encrypt(struct ieee80211_tx_data *tx);
 ieee80211_rx_result
 ieee80211_crypto_aes_cmac_decrypt(struct ieee80211_rx_data *rx);
+ieee80211_tx_result
+ieee80211_crypto_hw_encrypt(struct ieee80211_tx_data *tx);
 
 #endif /* WPA_H */