6 files changed, 42 insertions, 37 deletions

diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index cb429723b2c8..a68b91764627 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -670,15 +670,15 @@ static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)
 {
         struct de_private *de = netdev_priv(dev);
         u16 hash_table[32];
-        struct dev_mc_list *mclist;
+        struct netdev_hw_addr *ha;
         int i;
         u16 *eaddrs;
 
         memset(hash_table, 0, sizeof(hash_table));
         set_bit_le(255, hash_table);                    /* Broadcast entry */
         /* This should work on big-endian machines as well. */
-        netdev_for_each_mc_addr(mclist, dev) {
-                int index = ether_crc_le(ETH_ALEN, mclist->dmi_addr) & 0x1ff;
+        netdev_for_each_mc_addr(ha, dev) {
+                int index = ether_crc_le(ETH_ALEN, ha->addr) & 0x1ff;
 
                 set_bit_le(index, hash_table);
         }
@@ -699,13 +699,13 @@ static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)
 static void build_setup_frame_perfect(u16 *setup_frm, struct net_device *dev)
 {
         struct de_private *de = netdev_priv(dev);
-        struct dev_mc_list *mclist;
+        struct netdev_hw_addr *ha;
         u16 *eaddrs;
 
         /* We have <= 14 addresses so we can use the wonderful
            16 address perfect filtering of the Tulip. */
-        netdev_for_each_mc_addr(mclist, dev) {
-                eaddrs = (u16 *)mclist->dmi_addr;
+        netdev_for_each_mc_addr(ha, dev) {
+                eaddrs = (u16 *) ha->addr;
                 *setup_frm++ = *eaddrs; *setup_frm++ = *eaddrs++;
                 *setup_frm++ = *eaddrs; *setup_frm++ = *eaddrs++;
                 *setup_frm++ = *eaddrs; *setup_frm++ = *eaddrs++;
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
index 55ade8949a68..cac4bcc83187 100644
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
@@ -1951,7 +1951,7 @@ static void
 SetMulticastFilter(struct net_device *dev)
 {
     struct de4x5_private *lp = netdev_priv(dev);
-    struct dev_mc_list *dmi;
+    struct netdev_hw_addr *ha;
     u_long iobase = dev->base_addr;
     int i, bit, byte;
     u16 hashcode;
@@ -1966,8 +1966,8 @@ SetMulticastFilter(struct net_device *dev)
     if ((dev->flags & IFF_ALLMULTI) || (netdev_mc_count(dev) > 14)) {
         omr |= OMR_PM;                       /* Pass all multicasts */
     } else if (lp->setup_f == HASH_PERF) {   /* Hash Filtering */
-        netdev_for_each_mc_addr(dmi, dev) {
-            addrs = dmi->dmi_addr;
+        netdev_for_each_mc_addr(ha, dev) {
+            addrs = ha->addr;
             if ((*addrs & 0x01) == 1) {      /* multicast address? */
                 crc = ether_crc_le(ETH_ALEN, addrs);
                 hashcode = crc & HASH_BITS;  /* hashcode is 9 LSb of CRC */
@@ -1983,8 +1983,8 @@ SetMulticastFilter(struct net_device *dev)
             }
         }
     } else {                                 /* Perfect filtering */
-        netdev_for_each_mc_addr(dmi, dev) {
-            addrs = dmi->dmi_addr;
+        netdev_for_each_mc_addr(ha, dev) {
+            addrs = ha->addr;
             for (i=0; i<ETH_ALEN; i++) {
                 *(pa + (i&1)) = *addrs++;
                 if (i & 0x01) pa += 4;
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index 95b38d803e9b..a039c8ab98b2 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -1454,7 +1454,7 @@ static void update_cr6(u32 cr6_data, unsigned long ioaddr)
 
 static void dm9132_id_table(struct DEVICE *dev)
 {
-        struct dev_mc_list *mcptr;
+        struct netdev_hw_addr *ha;
         u16 * addrptr;
         unsigned long ioaddr = dev->base_addr+0xc0;             /* ID Table */
         u32 hash_val;
@@ -1478,8 +1478,8 @@ static void dm9132_id_table(struct DEVICE *dev)
         hash_table[3] = 0x8000;
 
         /* the multicast address in Hash Table : 64 bits */
-        netdev_for_each_mc_addr(mcptr, dev) {
-                hash_val = cal_CRC((char *) mcptr->dmi_addr, 6, 0) & 0x3f;
+        netdev_for_each_mc_addr(ha, dev) {
+                hash_val = cal_CRC((char *) ha->addr, 6, 0) & 0x3f;
                 hash_table[hash_val / 16] |= (u16) 1 << (hash_val % 16);
         }
 
@@ -1497,7 +1497,7 @@ static void dm9132_id_table(struct DEVICE *dev)
 static void send_filter_frame(struct DEVICE *dev)
 {
         struct dmfe_board_info *db = netdev_priv(dev);
-        struct dev_mc_list *mcptr;
+        struct netdev_hw_addr *ha;
         struct tx_desc *txptr;
         u16 * addrptr;
         u32 * suptr;
@@ -1520,8 +1520,8 @@ static void send_filter_frame(struct DEVICE *dev)
         *suptr++ = 0xffff;
 
         /* fit the multicast address */
-        netdev_for_each_mc_addr(mcptr, dev) {
-                addrptr = (u16 *) mcptr->dmi_addr;
+        netdev_for_each_mc_addr(ha, dev) {
+                addrptr = (u16 *) ha->addr;
                 *suptr++ = addrptr[0];
                 *suptr++ = addrptr[1];
                 *suptr++ = addrptr[2];
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 7f544ef2f5fc..c4b7cd726b69 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -990,15 +990,15 @@ static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)
 {
         struct tulip_private *tp = netdev_priv(dev);
         u16 hash_table[32];
-        struct dev_mc_list *mclist;
+        struct netdev_hw_addr *ha;
         int i;
         u16 *eaddrs;
 
         memset(hash_table, 0, sizeof(hash_table));
         set_bit_le(255, hash_table);                    /* Broadcast entry */
         /* This should work on big-endian machines as well. */
-        netdev_for_each_mc_addr(mclist, dev) {
-                int index = ether_crc_le(ETH_ALEN, mclist->dmi_addr) & 0x1ff;
+        netdev_for_each_mc_addr(ha, dev) {
+                int index = ether_crc_le(ETH_ALEN, ha->addr) & 0x1ff;
 
                 set_bit_le(index, hash_table);
         }
@@ -1018,13 +1018,13 @@ static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)
 static void build_setup_frame_perfect(u16 *setup_frm, struct net_device *dev)
 {
         struct tulip_private *tp = netdev_priv(dev);
-        struct dev_mc_list *mclist;
+        struct netdev_hw_addr *ha;
         u16 *eaddrs;
 
         /* We have <= 14 addresses so we can use the wonderful
            16 address perfect filtering of the Tulip. */
-        netdev_for_each_mc_addr(mclist, dev) {
-                eaddrs = (u16 *)mclist->dmi_addr;
+        netdev_for_each_mc_addr(ha, dev) {
+                eaddrs = (u16 *) ha->addr;
                 *setup_frm++ = *eaddrs; *setup_frm++ = *eaddrs++;
                 *setup_frm++ = *eaddrs; *setup_frm++ = *eaddrs++;
                 *setup_frm++ = *eaddrs; *setup_frm++ = *eaddrs++;
@@ -1061,7 +1061,7 @@ static void set_rx_mode(struct net_device *dev)
         } else  if (tp->flags & MC_HASH_ONLY) {
                 /* Some work-alikes have only a 64-entry hash filter table. */
                 /* Should verify correctness on big-endian/__powerpc__ */
-                struct dev_mc_list *mclist;
+                struct netdev_hw_addr *ha;
                 if (netdev_mc_count(dev) > 64) {
                         /* Arbitrary non-effective limit. */
                         tp->csr6 |= AcceptAllMulticast;
@@ -1069,18 +1069,21 @@ static void set_rx_mode(struct net_device *dev)
                 } else {
                         u32 mc_filter[2] = {0, 0};               /* Multicast hash filter */
                         int filterbit;
-                        netdev_for_each_mc_addr(mclist, dev) {
+                        netdev_for_each_mc_addr(ha, dev) {
                                 if (tp->flags & COMET_MAC_ADDR)
-                                        filterbit = ether_crc_le(ETH_ALEN, mclist->dmi_addr);
+                                        filterbit = ether_crc_le(ETH_ALEN,
+                                                                 ha->addr);
                                 else
-                                        filterbit = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26;
+                                        filterbit = ether_crc(ETH_ALEN,
+                                                              ha->addr) >> 26;
                                 filterbit &= 0x3f;
                                 mc_filter[filterbit >> 5] |= 1 << (filterbit & 31);
                                 if (tulip_debug > 2)
                                         dev_info(&dev->dev,
                                                  "Added filter for %pM  %08x bit %d\n",
-                                                 mclist->dmi_addr,
-                                                 ether_crc(ETH_ALEN, mclist->dmi_addr), filterbit);
+                                                 ha->addr,
+                                                 ether_crc(ETH_ALEN, ha->addr),
+                                                 filterbit);
                         }
                         if (mc_filter[0] == tp->mc_filter[0]  &&
                                 mc_filter[1] == tp->mc_filter[1])
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index 0ab05af237e5..b79d908fe34e 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -1392,7 +1392,7 @@ static void update_cr6(u32 cr6_data, unsigned long ioaddr)
 static void send_filter_frame(struct net_device *dev, int mc_cnt)
 {
         struct uli526x_board_info *db = netdev_priv(dev);
-        struct dev_mc_list *mcptr;
+        struct netdev_hw_addr *ha;
         struct tx_desc *txptr;
         u16 * addrptr;
         u32 * suptr;
@@ -1415,8 +1415,8 @@ static void send_filter_frame(struct net_device *dev, int mc_cnt)
         *suptr++ = 0xffff << FLT_SHIFT;
 
         /* fit the multicast address */
-        netdev_for_each_mc_addr(mcptr, dev) {
-                addrptr = (u16 *) mcptr->dmi_addr;
+        netdev_for_each_mc_addr(ha, dev) {
+                addrptr = (u16 *) ha->addr;
                 *suptr++ = addrptr[0] << FLT_SHIFT;
                 *suptr++ = addrptr[1] << FLT_SHIFT;
                 *suptr++ = addrptr[2] << FLT_SHIFT;
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 304f43866c44..3e3822c98a0d 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -1367,13 +1367,15 @@ static u32 __set_rx_mode(struct net_device *dev)
                 memset(mc_filter, 0xff, sizeof(mc_filter));
                 rx_mode = RxAcceptBroadcast | AcceptMulticast | AcceptMyPhys;
         } else {
-                struct dev_mc_list *mclist;
+                struct netdev_hw_addr *ha;
 
                 memset(mc_filter, 0, sizeof(mc_filter));
-                netdev_for_each_mc_addr(mclist, dev) {
-                        int filterbit = (ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26) ^ 0x3F;
-                        filterbit &= 0x3f;
-                        mc_filter[filterbit >> 5] |= 1 << (filterbit & 31);
+                netdev_for_each_mc_addr(ha, dev) {
+                        int filbit;
+
+                        filbit = (ether_crc(ETH_ALEN, ha->addr) >> 26) ^ 0x3F;
+                        filbit &= 0x3f;
+                        mc_filter[filbit >> 5] |= 1 << (filbit & 31);
                 }
                 rx_mode = RxAcceptBroadcast | AcceptMulticast | AcceptMyPhys;
         }