1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index 10a20fb9ae65..93185f5f09ac 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -583,7 +583,7 @@ static void net_tx_timeout (struct net_device *dev)
         outb (0x00, ioaddr + TX_START);
         outb (0x03, ioaddr + COL16CNTL);
 
-        dev->trans_start = jiffies;
+        dev->trans_start = jiffies; /* prevent tx timeout */
 
         lp->tx_started = 0;
         lp->tx_queue_ready = 1;
@@ -636,7 +636,6 @@ static netdev_tx_t net_send_packet (struct sk_buff *skb,
                 outb (0x80 | lp->tx_queue, ioaddr + TX_START);
                 lp->tx_queue = 0;
                 lp->tx_queue_len = 0;
-                dev->trans_start = jiffies;
                 lp->tx_started = 1;
                 netif_start_queue (dev);
         } else if (lp->tx_queue_len < 4096 - 1502)
@@ -796,7 +795,6 @@ net_rx(struct net_device *dev)
                         printk("%s: Exint Rx packet with mode %02x after %d ticks.\n",
                                    dev->name, inb(ioaddr + RX_MODE), i);
         }
-        return;
 }
 
 /* The inverse routine to net_open(). */
@@ -847,12 +845,12 @@ 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) {
+                netdev_for_each_mc_addr(ha, dev) {
                         unsigned int bit =
-                                ether_crc_le(ETH_ALEN, mclist->dmi_addr) >> 26;
+                                ether_crc_le(ETH_ALEN, ha->addr) >> 26;
                         mc_filter[bit >> 3] |= (1 << bit);
                 }
                 outb(0x02, ioaddr + RX_MODE);   /* Use normal mode. */
@@ -870,7 +868,6 @@ set_rx_mode(struct net_device *dev)
                 outw(saved_bank, ioaddr + CONFIG_0);
         }
         spin_unlock_irqrestore (&lp->lock, flags);
-        return;
 }
 
 #ifdef MODULE