5 files changed, 16 insertions, 16 deletions

diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 09291e60d309..333cb3344d54 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -1623,11 +1623,11 @@ static struct net_device_stats *get_stats(struct net_device *dev)
  
 static inline void make_mc_bits(u8 *bits, struct net_device *dev)
 {
-        struct dev_mc_list *dmi;
+        struct netdev_hw_addr *ha;
         u32 crc;
 
-        netdev_for_each_mc_addr(dmi, dev) {
-                crc = ether_crc(ETH_ALEN, dmi->dmi_addr);
+        netdev_for_each_mc_addr(ha, dev) {
+                crc = ether_crc(ETH_ALEN, ha->addr);
                 /* 
                  * The 8390 uses the 6 most significant bits of the
                  * CRC to index the multicast table.
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index b9dc80b9d04a..6734f7d6da98 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -1196,11 +1196,11 @@ static void set_rx_mode(struct net_device *dev)
         memset(mc_filter, 0x00, sizeof(mc_filter));
         outb(1, ioaddr + RX_MODE);      /* Ignore almost all multicasts. */
     } 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) {
-            unsigned int bit = ether_crc_le(ETH_ALEN, mclist->dmi_addr) >> 26;
+        netdev_for_each_mc_addr(ha, dev) {
+            unsigned int bit = ether_crc_le(ETH_ALEN, ha->addr) >> 26;
             mc_filter[bit >> 3] |= (1 << (bit & 7));
         }
         outb(2, ioaddr + RX_MODE);      /* Use normal mode. */
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index c717b143f11a..c516c1996354 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -1475,7 +1475,7 @@ static void set_multicast_list(struct net_device *dev)
 {
   mace_private *lp = netdev_priv(dev);
   int adr[ETHER_ADDR_LEN] = {0}; /* Ethernet address */
-  struct dev_mc_list *dmi;
+  struct netdev_hw_addr *ha;
 
 #ifdef PCMCIA_DEBUG
   {
@@ -1495,8 +1495,8 @@ static void set_multicast_list(struct net_device *dev)
   if (num_addrs > 0) {
     /* Calculate multicast logical address filter */
     memset(lp->multicast_ladrf, 0, MACE_LADRF_LEN);
-    netdev_for_each_mc_addr(dmi, dev) {
-      memcpy(adr, dmi->dmi_addr, ETHER_ADDR_LEN);
+    netdev_for_each_mc_addr(ha, dev) {
+      memcpy(adr, ha->addr, ETHER_ADDR_LEN);
       BuildLAF(lp->multicast_ladrf, adr);
     }
   }
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index 5adc662c4bfb..f45c626003a4 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -1616,12 +1616,12 @@ static void set_rx_mode(struct net_device *dev)
         rx_cfg_setting = RxStripCRC | RxEnable | RxAllMulti;
     else {
         if (!netdev_mc_empty(dev)) {
-            struct dev_mc_list *mc_addr;
+            struct netdev_hw_addr *ha;
 
-            netdev_for_each_mc_addr(mc_addr, dev) {
-                u_int position = ether_crc(6, mc_addr->dmi_addr);
+            netdev_for_each_mc_addr(ha, dev) {
+                u_int position = ether_crc(6, ha->addr);
 #ifndef final_version           /* Verify multicast address. */
-                if ((mc_addr->dmi_addr[0] & 1) == 0)
+                if ((ha->addr[0] & 1) == 0)
                     continue;
 #endif
                 multicast_table[position >> 29] |= 1 << ((position >> 26) & 7);
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index 4d1802e457be..656be931207a 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -1398,7 +1398,7 @@ static void set_addresses(struct net_device *dev)
 {
         unsigned int ioaddr = dev->base_addr;
         local_info_t *lp = netdev_priv(dev);
-        struct dev_mc_list *dmi;
+        struct netdev_hw_addr *ha;
         struct set_address_info sa_info;
         int i;
 
@@ -1413,10 +1413,10 @@ static void set_addresses(struct net_device *dev)
 
         set_address(&sa_info, dev->dev_addr);
         i = 0;
-        netdev_for_each_mc_addr(dmi, dev) {
+        netdev_for_each_mc_addr(ha, dev) {
                 if (i++ == 9)
                         break;
-                set_address(&sa_info, dmi->dmi_addr);
+                set_address(&sa_info, ha->addr);
         }
         while (i++ < 9)
                 set_address(&sa_info, dev->dev_addr);