1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 6580d78397d1..7c27c50211a5 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -878,7 +878,6 @@ static netdev_tx_t fjn_start_xmit(struct sk_buff *skb,
             lp->sent = lp->tx_queue ;
             lp->tx_queue = 0;
             lp->tx_queue_len = 0;
-            dev->trans_start = jiffies;
             lp->tx_started = 1;
             netif_start_queue(dev);
         } else {
@@ -1070,8 +1069,6 @@ static void fjn_rx(struct net_device *dev)
                   "%d ticks.\n", dev->name, inb(ioaddr + RX_MODE), i);
     }
 */
-
-    return;
 } /* fjn_rx */
 
 /*====================================================================*/
@@ -1184,11 +1181,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. */