diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-14 18:00:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-14 18:00:48 -0400 |
| commit | c597f6653d5734c11b1e3217c7619a37e96e5a1f (patch) | |
| tree | 2c24b46bbe265f3284dcec0a001f7af498794964 /net/wireless/scan.c | |
| parent | 669d67bf777def468970f2dcba1537edf3b2d329 (diff) | |
| parent | 341352d13dae752610342923c53ebe461624ee2c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'net/wireless/scan.c')
| -rw-r--r-- | net/wireless/scan.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 26d96d7ffba8..af2b1caa37fa 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c | |||
| @@ -378,7 +378,11 @@ static int cmp_bss_core(struct cfg80211_bss *a, | |||
| 378 | b->len_information_elements); | 378 | b->len_information_elements); |
| 379 | } | 379 | } |
| 380 | 380 | ||
| 381 | return compare_ether_addr(a->bssid, b->bssid); | 381 | /* |
| 382 | * we can't use compare_ether_addr here since we need a < > operator. | ||
| 383 | * The binary return value of compare_ether_addr isn't enough | ||
| 384 | */ | ||
| 385 | return memcmp(a->bssid, b->bssid, sizeof(a->bssid)); | ||
| 382 | } | 386 | } |
| 383 | 387 | ||
| 384 | static int cmp_bss(struct cfg80211_bss *a, | 388 | static int cmp_bss(struct cfg80211_bss *a, |