diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-05 22:54:40 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-05 22:54:40 -0800 |
| commit | 730c30ec646bd252a9448a66ecd51d794853513f (patch) | |
| tree | c0d413860f9d8bf37374f17cfabb4911143465d7 /net/mac80211/sta_info.c | |
| parent | 726e07a8a38168266ac95d87736f9501a2d9e7b2 (diff) | |
| parent | 0a0755c9fe47dc9f8271935909c66096e43efbfe (diff) | |
| download | linux-730c30ec646bd252a9448a66ecd51d794853513f.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-sta.c
Diffstat (limited to 'net/mac80211/sta_info.c')
| -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 b22110a4a75e..10c5539c20ab 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); } |