diff options
author | John W. Linville <linville@tuxdriver.com> | 2009-12-28 15:09:11 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-12-28 15:09:11 -0500 |
commit | ea1e4b842049fcc4741096538114871a74859314 (patch) | |
tree | c2336ab480ac0fd62e0dc41b391d99c97158dc9c /drivers/net/b44.c | |
parent | b6ce5c33001b1dc83e6a1a6f30c5dccccea651b6 (diff) | |
parent | 92c6f8d849178582fc527aaf1e51dd37a74767d3 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/b44.c')
-rw-r--r-- | drivers/net/b44.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 2a9132343b66..4869adb69586 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c | |||
@@ -1505,8 +1505,7 @@ static int b44_magic_pattern(u8 *macaddr, u8 *ppattern, u8 *pmask, int offset) | |||
1505 | for (k = 0; k< ethaddr_bytes; k++) { | 1505 | for (k = 0; k< ethaddr_bytes; k++) { |
1506 | ppattern[offset + magicsync + | 1506 | ppattern[offset + magicsync + |
1507 | (j * ETH_ALEN) + k] = macaddr[k]; | 1507 | (j * ETH_ALEN) + k] = macaddr[k]; |
1508 | len++; | 1508 | set_bit(len++, (unsigned long *) pmask); |
1509 | set_bit(len, (unsigned long *) pmask); | ||
1510 | } | 1509 | } |
1511 | } | 1510 | } |
1512 | return len - 1; | 1511 | return len - 1; |