wireless: Convert compare_ether_addr to ether_addr_equal

[pandora-kernel.git] / net / wireless / scan.c

diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 70faadf..26d96d7 100644 (file)
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -18,7 +18,7 @@
 #include "nl80211.h"
 #include "wext-compat.h"
 
-#define IEEE80211_SCAN_RESULT_EXPIRE   (15 * HZ)
+#define IEEE80211_SCAN_RESULT_EXPIRE   (30 * HZ)
 
 void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev, bool leak)
 {
@@ -281,7 +281,7 @@ static bool is_bss(struct cfg80211_bss *a,
 {
        const u8 *ssidie;
 
-       if (bssid && compare_ether_addr(a->bssid, bssid))
+       if (bssid && !ether_addr_equal(a->bssid, bssid))
                return false;
 
        if (!ssid)
@@ -378,7 +378,7 @@ static int cmp_bss_core(struct cfg80211_bss *a,
                               b->len_information_elements);
        }
 
-       return memcmp(a->bssid, b->bssid, ETH_ALEN);
+       return compare_ether_addr(a->bssid, b->bssid);
 }
 
 static int cmp_bss(struct cfg80211_bss *a,