diff options
Diffstat (limited to 'net/wireless/scan.c')
-rw-r--r-- | net/wireless/scan.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 16fc437..ce793bd 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 (3 * HZ) +#define IEEE80211_SCAN_RESULT_EXPIRE (6 * HZ) void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev, bool leak) { @@ -330,8 +330,14 @@ 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, @@ -352,6 +358,15 @@ 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, |