1 files changed, 4 insertions, 11 deletions

diff --git a/drivers/net/depca.c b/drivers/net/depca.c
index 744c1928dfca..bf66e9b3b19e 100644
--- a/drivers/net/depca.c
+++ b/drivers/net/depca.c
@@ -921,7 +921,7 @@ static void depca_tx_timeout(struct net_device *dev)
         STOP_DEPCA;
         depca_init_ring(dev);
         LoadCSRs(dev);
-        dev->trans_start = jiffies;
+        dev->trans_start = jiffies; /* prevent tx timeout */
         netif_wake_queue(dev);
         InitRestartDepca(dev);
 }
@@ -954,7 +954,6 @@ static netdev_tx_t depca_start_xmit(struct sk_buff *skb,
                         outw(CSR0, DEPCA_ADDR);
                         outw(INEA | TDMD, DEPCA_DATA);
 
-                        dev->trans_start = jiffies;
                         dev_kfree_skb(skb);
                 }
                 if (TX_BUFFS_AVAIL)
@@ -1204,8 +1203,6 @@ static void LoadCSRs(struct net_device *dev)
         outw(ACON, DEPCA_DATA);
 
         outw(CSR0, DEPCA_ADDR); /* Point back to CSR0 */
-
-        return;
 }
 
 static int InitRestartDepca(struct net_device *dev)
@@ -1272,7 +1269,7 @@ static void set_multicast_list(struct net_device *dev)
 static void SetMulticastFilter(struct net_device *dev)
 {
         struct depca_private *lp = netdev_priv(dev);
-        struct dev_mc_list *dmi;
+        struct netdev_hw_addr *ha;
         char *addrs;
         int i, j, bit, byte;
         u16 hashcode;
@@ -1287,8 +1284,8 @@ static void SetMulticastFilter(struct net_device *dev)
                         lp->init_block.mcast_table[i] = 0;
                 }
                 /* Add multicast addresses */
-                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(ETH_ALEN, addrs);
                                 hashcode = (crc & 1);   /* hashcode is 6 LSb of CRC ... */
@@ -1303,8 +1300,6 @@ static void SetMulticastFilter(struct net_device *dev)
                         }
                 }
         }
-
-        return;
 }
 
 static int __init depca_common_init (u_long ioaddr, struct net_device **devp)
@@ -1909,8 +1904,6 @@ static void depca_dbg_open(struct net_device *dev)
                 outw(CSR3, DEPCA_ADDR);
                 printk("CSR3: 0x%4.4x\n", inw(DEPCA_DATA));
         }
-
-        return;
 }
 
 /*