projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cd32984
ba54238
)
Merge branch 'master' of git://git.infradead.org/users/linville/wireless
author
John W. Linville
<linville@tuxdriver.com>
Wed, 28 Sep 2011 14:28:09 +0000
(10:28 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Wed, 28 Sep 2011 14:28:09 +0000
(10:28 -0400)
Conflicts:
drivers/net/wireless/iwlwifi/iwl-scan.c
net/wireless/nl80211.c
1
2
drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/ath/ath9k/recv.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlegacy/iwl-core.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlegacy/iwl3945-base.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlegacy/iwl4965-base.c
patch
|
diff1
|
diff2
|
blob
|
history
net/wireless/nl80211.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
Simple merge
diff --cc
drivers/net/wireless/ath/ath9k/recv.c
Simple merge
diff --cc
drivers/net/wireless/iwlegacy/iwl-core.c
Simple merge
diff --cc
drivers/net/wireless/iwlegacy/iwl3945-base.c
Simple merge
diff --cc
drivers/net/wireless/iwlegacy/iwl4965-base.c
Simple merge
diff --cc
net/wireless/nl80211.c
index bf3fc4f264f50af6f78413c9537d460d704a52de,ea40d540a9901d6f1c5fe4857583136b57e11bdf..b85075761e2422eaa2f8f2170501359b3e400bab
---
1
/
net/wireless/nl80211.c
---
2
/
net/wireless/nl80211.c
+++ b/
net/wireless/nl80211.c
@@@
-4300,7
-4113,14
+4300,10
@@@
static int nl80211_crypto_settings(stru
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_akm_suites; i++)
- if (!nl80211_valid_akm_suite(settings->akm_suites[i]))
- return -EINVAL;
}
return 0;