From 486732d7daa500fe2de87d6f0f0aa9817de11695 Mon Sep 17 00:00:00 2001
From: Yoni Divinsky <yoni.divinsky@ti.com>
Date: Mon, 16 Jan 2012 15:18:59 +0200
Subject: [PATCH] --- yaml --- r: 286202 b: refs/heads/master c:
 d32a102819eef99d4d87019266bea208447be0a0 h: refs/heads/master v: v3

---
 [refs]                   |  2 +-
 trunk/net/mac80211/tx.c  | 10 +---------
 trunk/net/mac80211/wpa.c | 19 +++++++++++++++++++
 trunk/net/mac80211/wpa.h |  2 ++
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 9d71a7fc295e..aed38d9ab529 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 331d9301ed4d0fe33e9762c62f2870243bcf77eb
+refs/heads/master: d32a102819eef99d4d87019266bea208447be0a0
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index edcd1c7ab83f..e05667cd5e76 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/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/trunk/net/mac80211/wpa.c b/trunk/net/mac80211/wpa.c
index 422b79851ec5..b758350919ff 100644
--- a/trunk/net/mac80211/wpa.c
+++ b/trunk/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/trunk/net/mac80211/wpa.h b/trunk/net/mac80211/wpa.h
index baba0608313e..07e33f899c71 100644
--- a/trunk/net/mac80211/wpa.h
+++ b/trunk/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 */