From f0d7f7fb37a848aeb075d6121ffd502d2b597cf8 Mon Sep 17 00:00:00 2001
From: Dai Shuibing <shuibing@qca.qualcomm.com>
Date: Thu, 3 Nov 2011 11:39:38 +0200
Subject: [PATCH] --- yaml --- r: 279199 b: refs/heads/master c:
 b8214df1d963cad2aae1479b86452e205312004e h: refs/heads/master i:   279197:
 cf80ce69dfa44efa7a709c686396ab74e4391d75   279195:
 96e5b92adec8a08a422642676060ab8cf7095bb5   279191:
 7e2d6806f3b00cea3aefaf5d8c701b7cb510e50a   279183:
 146c0ed668272ccf48d6e7ebe99a4432731e3155   279167:
 c0b1871e1c5a252701dd2573cc2916408ca0d629 v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b23818127a09..a7a21481c500 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e07021e434a64c454b0e9fb9f5aa763f131b22b
+refs/heads/master: b8214df1d963cad2aae1479b86452e205312004e
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c
index d2b23da8bdd6..f612639cf3c4 100644
--- a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -2093,6 +2093,9 @@ static int ath6kl_ap_beacon(struct wiphy *wiphy, struct net_device *dev,
 		case WLAN_CIPHER_SUITE_CCMP:
 			p.prwise_crypto_type |= AES_CRYPT;
 			break;
+		case WLAN_CIPHER_SUITE_SMS4:
+			p.prwise_crypto_type |= WAPI_CRYPT;
+			break;
 		}
 	}
 	if (p.prwise_crypto_type == 0) {
@@ -2112,6 +2115,9 @@ static int ath6kl_ap_beacon(struct wiphy *wiphy, struct net_device *dev,
 	case WLAN_CIPHER_SUITE_CCMP:
 		p.grp_crypto_type = AES_CRYPT;
 		break;
+	case WLAN_CIPHER_SUITE_SMS4:
+		p.grp_crypto_type = WAPI_CRYPT;
+		break;
 	default:
 		p.grp_crypto_type = NONE_CRYPT;
 		break;