From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 27 Aug 2010 11:26:51 +0000 (+0300)
Subject: cfg80211: allow vendor specific cipher suites
X-Git-Tag: v2.6.37-rc1~147^2~584^2^2~29
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7d64b7cc1fc33bab24567903a93f699d11649c0b;p=~emulex%2Finfiniband.git

cfg80211: allow vendor specific cipher suites

cfg80211 currently rejects all cipher suites it
doesn't know about for key length checking
purposes. This can lead to inconsistencies when
a driver advertises an algorithm that cfg80211
doesn't know about. Remove this rejection so
drivers can specify any algorithm they like.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/wireless/util.c b/net/wireless/util.c
index 8d961cc4ae9..bca32eb8f44 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -183,7 +183,14 @@ int cfg80211_validate_key_settings(struct cfg80211_registered_device *rdev,
 			return -EINVAL;
 		break;
 	default:
-		return -EINVAL;
+		/*
+		 * We don't know anything about this algorithm,
+		 * allow using it -- but the driver must check
+		 * all parameters! We still check below whether
+		 * or not the driver supports this algorithm,
+		 * of course.
+		 */
+		break;
 	}
 
 	if (params->seq) {