aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorrogersb11 <brettrogers11@gmail.com>2015-12-08 17:47:58 -0500
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-12-08 15:27:13 -0800
commit546eacec92bfd72fb3bc4fe30a7db84d54c24b26 (patch)
tree3f3bf0659408ac5ca4280a632146b29d1564b764 /net/wireless
parent31a71061e8e46a3cace26ee2dfd06c5405aa514f (diff)
downloadkernel_samsung_smdk4412-546eacec92bfd72fb3bc4fe30a7db84d54c24b26.zip
kernel_samsung_smdk4412-546eacec92bfd72fb3bc4fe30a7db84d54c24b26.tar.gz
kernel_samsung_smdk4412-546eacec92bfd72fb3bc4fe30a7db84d54c24b26.tar.bz2
Revert "bcmdhd: update from i9305 source drop (1.141.15 --> 1.141.44)"
This reverts commit e030f5a0b6445d2f2526abe16e233def99de97bb. Change-Id: I9ba7cb2baefd8435d5e74aeaca188fc1cdfdab2c
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/nl80211.c8
-rw-r--r--net/wireless/scan.c17
2 files changed, 4 insertions, 21 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 439bdad..f53ba4e 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -4565,12 +4565,10 @@ 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);
-#if 0 /* Below codes to validate AKM suites are not valid over the Linux Kernel ver 3.8 */
- for (i = 0; i < settings->n_akm_suites; i++)
- if (!nl80211_valid_akm_suite(settings->akm_suites[i]))
- return -EINVAL;
-#endif
}
return 0;
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index ce793bd..16fc437 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -17,7 +17,7 @@
#include "nl80211.h"
#include "wext-compat.h"
-#define IEEE80211_SCAN_RESULT_EXPIRE (6 * HZ)
+#define IEEE80211_SCAN_RESULT_EXPIRE (3 * HZ)
void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev, bool leak)
{
@@ -330,14 +330,8 @@ static int cmp_bss(struct cfg80211_bss *a,
{
int r;
-#if !(defined(CONFIG_BCM4335) || defined(CONFIG_BCM4335_MODULE) \
- || defined(CONFIG_BCM4339) || defined(CONFIG_BCM4339_MODULE) \
- || defined(CONFIG_BCM4354) || defined(CONFIG_BCM4354_MODULE) \
- || defined(CONFIG_BCM4356) || defined(CONFIG_BCM4356_MODULE) \
- || defined(CONFIG_BCM4358) || defined(CONFIG_BCM4358_MODULE))
if (a->channel != b->channel)
return b->channel->center_freq - a->channel->center_freq;
-#endif /* CONFIG_BCM43xx */
if (is_mesh_bss(a) && is_mesh_bss(b)) {
r = cmp_ies(WLAN_EID_MESH_ID,
@@ -358,15 +352,6 @@ static int cmp_bss(struct cfg80211_bss *a,
if (r)
return r;
-#if (defined(CONFIG_BCM4335) || defined(CONFIG_BCM4335_MODULE) \
- || defined(CONFIG_BCM4339) || defined(CONFIG_BCM4339_MODULE) \
- || defined(CONFIG_BCM4354) || defined(CONFIG_BCM4354_MODULE) \
- || defined(CONFIG_BCM4356) || defined(CONFIG_BCM4356_MODULE) \
- || defined(CONFIG_BCM4358) || defined(CONFIG_BCM4358_MODULE))
- if (a->channel != b->channel)
- return b->channel->center_freq - a->channel->center_freq;
-#endif /* CONFIG_BCM43xx */
-
return cmp_ies(WLAN_EID_SSID,
a->information_elements,
a->len_information_elements,