diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-09-28 10:28:09 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-09-28 10:28:09 -0400 |
| commit | 0874073570d9184a169a4ae2abbe8dbcb71878e9 (patch) | |
| tree | 81af47abc50641f911e3b5833850357a48a82be8 /net/wireless | |
| parent | cd32984f64cb4fdd84e33f30da1f10582fc43cbf (diff) | |
| parent | ba54238552625aad2d75f455a4d3db18ea7dec68 (diff) | |
Merge branch 'master' of git://git.infradead.org/users/linville/wireless
Conflicts:
drivers/net/wireless/iwlwifi/iwl-scan.c
net/wireless/nl80211.c
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/nl80211.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index bf3fc4f264f5..b85075761e24 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c | |||
| @@ -4300,6 +4300,9 @@ static int nl80211_crypto_settings(struct cfg80211_registered_device *rdev, | |||
| 4300 | if (len % sizeof(u32)) | 4300 | if (len % sizeof(u32)) |
| 4301 | return -EINVAL; | 4301 | return -EINVAL; |
| 4302 | 4302 | ||
| 4303 | if (settings->n_akm_suites > NL80211_MAX_NR_AKM_SUITES) | ||
| 4304 | return -EINVAL; | ||
| 4305 | |||
| 4303 | memcpy(settings->akm_suites, data, len); | 4306 | memcpy(settings->akm_suites, data, len); |
| 4304 | } | 4307 | } |
| 4305 | 4308 | ||