diff options
author | David S. Miller <davem@davemloft.net> | 2008-12-06 07:09:56 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-06 07:09:56 +0100 |
commit | 0a0755c9fe47dc9f8271935909c66096e43efbfe (patch) | |
tree | dd24b9a654f96742a3600d6735c81950ef16dc39 /net | |
parent | tcp: tcp_vegas ssthresh bug fix (diff) | |
parent | zd1211rw: use unaligned safe memcmp() in-place of compare_ether_addr() (diff) | |
download | linux-0a0755c9fe47dc9f8271935909c66096e43efbfe.tar.xz linux-0a0755c9fe47dc9f8271935909c66096e43efbfe.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
-rw-r--r-- | net/mac80211/sta_info.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 7fef8ea1f5ec..d254446b85b5 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -99,7 +99,7 @@ struct sta_info *sta_info_get(struct ieee80211_local *local, const u8 *addr) sta = rcu_dereference(local->sta_hash[STA_HASH(addr)]); while (sta) { - if (compare_ether_addr(sta->sta.addr, addr) == 0) + if (memcmp(sta->sta.addr, addr, ETH_ALEN) == 0) break; sta = rcu_dereference(sta->hnext); } |