Merge branch 'for-davem' of git://git.infradead.org/users/linville/wireless

This commit is contained in:
David S. Miller 2011-09-27 22:42:30 -04:00
commit b582ad8e96
10 changed files with 46 additions and 30 deletions

View file

@ -4113,9 +4113,12 @@ static int nl80211_crypto_settings(struct cfg80211_registered_device *rdev,
if (len % sizeof(u32))
return -EINVAL;
if (settings->n_akm_suites > NL80211_MAX_NR_AKM_SUITES)
return -EINVAL;
memcpy(settings->akm_suites, data, len);
for (i = 0; i < settings->n_ciphers_pairwise; i++)
for (i = 0; i < settings->n_akm_suites; i++)
if (!nl80211_valid_akm_suite(settings->akm_suites[i]))
return -EINVAL;
}