1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 59f6fa3c9dd..5b3dfb4ab27 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -994,7 +994,7 @@ static void axnet_tx_timeout(struct net_device *dev)
 {
         long e8390_base = dev->base_addr;
         struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
-        int txsr, isr, tickssofar = jiffies - dev->trans_start;
+        int txsr, isr, tickssofar = jiffies - dev_trans_start(dev);
         unsigned long flags;
 
         dev->stats.tx_errors++;
@@ -1499,8 +1499,6 @@ static void ei_receive(struct net_device *dev)
                 ei_local->current_page = next_frame;
                 outb_p(next_frame-1, e8390_base+EN0_BOUNDARY);
         }
-
-        return;
 }
 
 /**
@@ -1611,11 +1609,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.