diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 16:44:43 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 16:44:43 -0500 |
commit | 58dc125a66145f45f239cd78db9410062dc0bcd4 (patch) | |
tree | 90537ddf035e96ca3182f61755ed234de93b449b /net/core/wireless.c | |
parent | c544bdb1999e04eb10035f1c3262a103859d94b2 (diff) | |
parent | 8a4c8a96a47c9e2f08156fd9664974df086eed50 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/core/wireless.c')
-rw-r--r-- | net/core/wireless.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/wireless.c b/net/core/wireless.c index 271ddb35b0b..f88b0affb3b 100644 --- a/net/core/wireless.c +++ b/net/core/wireless.c | |||
@@ -1506,7 +1506,7 @@ void wireless_spy_update(struct net_device * dev, | |||
1506 | 1506 | ||
1507 | /* Update all records that match */ | 1507 | /* Update all records that match */ |
1508 | for(i = 0; i < spydata->spy_number; i++) | 1508 | for(i = 0; i < spydata->spy_number; i++) |
1509 | if(!memcmp(address, spydata->spy_address[i], ETH_ALEN)) { | 1509 | if(!compare_ether_addr(address, spydata->spy_address[i])) { |
1510 | memcpy(&(spydata->spy_stat[i]), wstats, | 1510 | memcpy(&(spydata->spy_stat[i]), wstats, |
1511 | sizeof(struct iw_quality)); | 1511 | sizeof(struct iw_quality)); |
1512 | match = i; | 1512 | match = i; |