diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-08-27 14:26:51 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-27 13:27:07 -0400 |
| commit | 7d64b7cc1fc33bab24567903a93f699d11649c0b (patch) | |
| tree | b87c97377a413b1c8d562d135903ce128e7b4a65 | |
| parent | b49d09c5bf9a3261ae711ac3bb91e22c172db428 (diff) | |
| download | linux-stable-7d64b7cc1fc33bab24567903a93f699d11649c0b.tar.gz linux-stable-7d64b7cc1fc33bab24567903a93f699d11649c0b.tar.bz2 linux-stable-7d64b7cc1fc33bab24567903a93f699d11649c0b.zip | |
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>
| -rw-r--r-- | net/wireless/util.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index 8d961cc4ae98..bca32eb8f446 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) { |