From 6e25120b755cbeebaad02044cbecd6fc0a52a433 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Wed, 21 Sep 2011 18:11:33 +0300
Subject: [PATCH] --- yaml --- r: 266359 b: refs/heads/master c:
 6d30240e3d68f1da7303801f840132d0821f1767 h: refs/heads/master i:   266357:
 59eead8cff608102a36b91570c4743dba6938df5   266355:
 9d64a19148ea269b70b55650ea33b72ee106d79a   266351:
 0e610b3d873f63aabad264b8159579514fa2a225 v: v3

---
 [refs]                       |  2 +-
 trunk/net/wireless/nl80211.c | 12 +-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 0ff3e86da5db..64fcdeca3480 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37a41b4affa33bb237d3692bf51f1b5ebcaf29d8
+refs/heads/master: 6d30240e3d68f1da7303801f840132d0821f1767
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
index 3c6427abdf34..1722998f4984 100644
--- a/trunk/net/wireless/nl80211.c
+++ b/trunk/net/wireless/nl80211.c
@@ -4126,12 +4126,6 @@ static bool nl80211_valid_wpa_versions(u32 wpa_versions)
 				  NL80211_WPA_VERSION_2));
 }
 
-static bool nl80211_valid_akm_suite(u32 akm)
-{
-	return akm == WLAN_AKM_SUITE_8021X ||
-		akm == WLAN_AKM_SUITE_PSK;
-}
-
 static bool nl80211_valid_cipher_suite(u32 cipher)
 {
 	return cipher == WLAN_CIPHER_SUITE_WEP40 ||
@@ -4295,7 +4289,7 @@ static int nl80211_crypto_settings(struct cfg80211_registered_device *rdev,
 
 	if (info->attrs[NL80211_ATTR_AKM_SUITES]) {
 		void *data;
-		int len, i;
+		int len;
 
 		data = nla_data(info->attrs[NL80211_ATTR_AKM_SUITES]);
 		len = nla_len(info->attrs[NL80211_ATTR_AKM_SUITES]);
@@ -4305,10 +4299,6 @@ static int nl80211_crypto_settings(struct cfg80211_registered_device *rdev,
 			return -EINVAL;
 
 		memcpy(settings->akm_suites, data, len);
-
-		for (i = 0; i < settings->n_ciphers_pairwise; i++)
-			if (!nl80211_valid_akm_suite(settings->akm_suites[i]))
-				return -EINVAL;
 	}
 
 	return 0;