git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
net
/
hp100.c
diff --git
a/drivers/net/hp100.c
b/drivers/net/hp100.c
index
c3ecb11
..
b6519c1
100644
(file)
--- a/
drivers/net/hp100.c
+++ b/
drivers/net/hp100.c
@@
-2103,20
+2103,18
@@
static void hp100_set_multicast_list(struct net_device *dev)
#endif
netdev_for_each_mc_addr(ha, dev) {
addrs = ha->addr;
#endif
netdev_for_each_mc_addr(ha, dev) {
addrs = ha->addr;
- if ((*addrs & 0x01) == 0x01) { /* multicast address? */
#ifdef HP100_DEBUG
#ifdef HP100_DEBUG
-
printk("hp100: %s: multicast = %pM, ",
-
dev->name, addrs);
+ printk("hp100: %s: multicast = %pM, ",
+ dev->name, addrs);
#endif
#endif
-
for (i = idx = 0; i < 6; i++) {
-
idx ^= *addrs++ & 0x3f;
-
printk(":%02x:", idx);
-
}
+ for (i = idx = 0; i < 6; i++) {
+ idx ^= *addrs++ & 0x3f;
+ printk(":%02x:", idx);
+ }
#ifdef HP100_DEBUG
#ifdef HP100_DEBUG
-
printk("idx = %i\n", idx);
+ printk("idx = %i\n", idx);
#endif
#endif
- lp->hash_bytes[idx >> 3] |= (1 << (idx & 7));
- }
+ lp->hash_bytes[idx >> 3] |= (1 << (idx & 7));
}
}
#else
}
}
#else