1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/net/sonic.c b/drivers/net/sonic.c
index 287c251075e5..26e25d7f5829 100644
--- a/drivers/net/sonic.c
+++ b/drivers/net/sonic.c
@@ -174,7 +174,7 @@ static void sonic_tx_timeout(struct net_device *dev)
         /* Try to restart the adaptor. */
         sonic_init(dev);
         lp->stats.tx_errors++;
-        dev->trans_start = jiffies;
+        dev->trans_start = jiffies; /* prevent tx timeout */
         netif_wake_queue(dev);
 }
 
@@ -263,8 +263,6 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev)
 
         SONIC_WRITE(SONIC_CMD, SONIC_CR_TXP);
 
-        dev->trans_start = jiffies;
-
         return NETDEV_TX_OK;
 }
 
@@ -531,7 +529,7 @@ static void sonic_multicast_list(struct net_device *dev)
 {
         struct sonic_local *lp = netdev_priv(dev);
         unsigned int rcr;
-        struct dev_mc_list *dmi;
+        struct netdev_hw_addr *ha;
         unsigned char *addr;
         int i;
 
@@ -550,8 +548,8 @@ static void sonic_multicast_list(struct net_device *dev)
                                        netdev_mc_count(dev));
                         sonic_set_cam_enable(dev, 1);  /* always enable our own address */
                         i = 1;
-                        netdev_for_each_mc_addr(dmi, dev) {
-                                addr = dmi->dmi_addr;
+                        netdev_for_each_mc_addr(ha, dev) {
+                                addr = ha->addr;
                                 sonic_cda_put(dev, i, SONIC_CD_CAP0, addr[1] << 8 | addr[0]);
                                 sonic_cda_put(dev, i, SONIC_CD_CAP1, addr[3] << 8 | addr[2]);
                                 sonic_cda_put(dev, i, SONIC_CD_CAP2, addr[5] << 8 | addr[4]);