diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-06 01:54:40 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-06 01:54:40 -0500 |
| commit | 730c30ec646bd252a9448a66ecd51d794853513f (patch) | |
| tree | c0d413860f9d8bf37374f17cfabb4911143465d7 /net/mac80211 | |
| parent | 726e07a8a38168266ac95d87736f9501a2d9e7b2 (diff) | |
| parent | 0a0755c9fe47dc9f8271935909c66096e43efbfe (diff) | |
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')
| -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 b22110a4a75..10c5539c20a 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) | |||
| 99 | 99 | ||
| 100 | sta = rcu_dereference(local->sta_hash[STA_HASH(addr)]); | 100 | sta = rcu_dereference(local->sta_hash[STA_HASH(addr)]); |
| 101 | while (sta) { | 101 | while (sta) { |
| 102 | if (compare_ether_addr(sta->sta.addr, addr) == 0) | 102 | if (memcmp(sta->sta.addr, addr, ETH_ALEN) == 0) |
| 103 | break; | 103 | break; |
| 104 | sta = rcu_dereference(sta->hnext); | 104 | sta = rcu_dereference(sta->hnext); |
| 105 | } | 105 | } |