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 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
net
/
macmace.c
diff --git
a/drivers/net/macmace.c
b/drivers/net/macmace.c
index
52e9a51
..
a6e19fc
100644
(file)
--- a/
drivers/net/macmace.c
+++ b/
drivers/net/macmace.c
@@
-509,7
+509,7
@@
static void mace_set_multicast(struct net_device *dev)
mb->maccc |= PROM;
} else {
unsigned char multicast_filter[8];
mb->maccc |= PROM;
} else {
unsigned char multicast_filter[8];
- struct
dev_mc_list *dmi
;
+ struct
netdev_hw_addr *ha
;
if (dev->flags & IFF_ALLMULTI) {
for (i = 0; i < 8; i++) {
if (dev->flags & IFF_ALLMULTI) {
for (i = 0; i < 8; i++) {
@@
-518,8
+518,8
@@
static void mace_set_multicast(struct net_device *dev)
} else {
for (i = 0; i < 8; i++)
multicast_filter[i] = 0;
} else {
for (i = 0; i < 8; i++)
multicast_filter[i] = 0;
- netdev_for_each_mc_addr(
dmi
, dev) {
- crc = ether_crc_le(6,
dmi->dmi_
addr);
+ netdev_for_each_mc_addr(
ha
, dev) {
+ crc = ether_crc_le(6,
ha->
addr);
/* bit number in multicast_filter */
i = crc >> 26;
multicast_filter[i >> 3] |= 1 << (i & 7);
/* bit number in multicast_filter */
i = crc >> 26;
multicast_filter[i >> 3] |= 1 << (i & 7);