1 files changed, 9 insertions, 16 deletions

diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index cc0c731c4f09..bbbded76ff14 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -858,7 +858,6 @@ static void mdio_reset(long mdio_addr)
                 outl(MDDIR | MDIO | MDC, mdio_addr);
                 mdio_delay();
         }
-        return;
 }
 
 /**
@@ -953,8 +952,6 @@ static void mdio_write(struct net_device *net_dev, int phy_id, int location,
                 mdio_delay();
         }
         outl(0x00, mdio_addr);
-
-        return;
 }
 
 
@@ -1264,7 +1261,6 @@ static void sis630_set_eq(struct net_device *net_dev, u8 revision)
                         mdio_write(net_dev, sis_priv->cur_phy, MII_RESV,
                                                 (reg14h | 0x2000) & 0xBFFF);
         }
-        return;
 }
 
 /**
@@ -1499,7 +1495,7 @@ static void sis900_read_mode(struct net_device *net_dev, int *speed, int *duplex
         }
 
         if(netif_msg_link(sis_priv))
-                printk(KERN_INFO "%s: Media Link On %s %s-duplex \n",
+                printk(KERN_INFO "%s: Media Link On %s %s-duplex\n",
                                         net_dev->name,
                                         *speed == HW_SPEED_100_MBPS ?
                                                 "100mbps" : "10mbps",
@@ -1523,7 +1519,7 @@ static void sis900_tx_timeout(struct net_device *net_dev)
         int i;
 
         if(netif_msg_tx_err(sis_priv))
-                printk(KERN_INFO "%s: Transmit timeout, status %8.8x %8.8x \n",
+                printk(KERN_INFO "%s: Transmit timeout, status %8.8x %8.8x\n",
                         net_dev->name, inl(ioaddr + cr), inl(ioaddr + isr));
 
         /* Disable interrupts by clearing the interrupt mask. */
@@ -1553,14 +1549,13 @@ static void sis900_tx_timeout(struct net_device *net_dev)
 
         spin_unlock_irqrestore(&sis_priv->lock, flags);
 
-        net_dev->trans_start = jiffies;
+        net_dev->trans_start = jiffies; /* prevent tx timeout */
 
         /* load Transmit Descriptor Register */
         outl(sis_priv->tx_ring_dma, ioaddr + txdp);
 
         /* Enable all known interrupts by setting the interrupt mask. */
         outl((RxSOVR|RxORN|RxERR|RxOK|TxURN|TxERR|TxIDLE), ioaddr + imr);
-        return;
 }
 
 /**
@@ -1623,8 +1618,6 @@ sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev)
 
         spin_unlock_irqrestore(&sis_priv->lock, flags);
 
-        net_dev->trans_start = jiffies;
-
         if (netif_msg_tx_queued(sis_priv))
                 printk(KERN_DEBUG "%s: Queued Tx packet at %p size %d "
                        "to slot %d.\n",
@@ -2298,12 +2291,14 @@ static void set_rx_mode(struct net_device *net_dev)
                 /* Accept Broadcast packet, destination address matchs our
                  * MAC address, use Receive Filter to reject unwanted MCAST
                  * packets */
-                struct dev_mc_list *mclist;
+                struct netdev_hw_addr *ha;
                 rx_mode = RFAAB;
 
-                netdev_for_each_mc_addr(mclist, net_dev) {
-                        unsigned int bit_nr =
-                                sis900_mcast_bitnr(mclist->dmi_addr, sis_priv->chipset_rev);
+                netdev_for_each_mc_addr(ha, net_dev) {
+                        unsigned int bit_nr;
+
+                        bit_nr = sis900_mcast_bitnr(ha->addr,
+                                                    sis_priv->chipset_rev);
                         mc_filter[bit_nr >> 4] |= (1 << (bit_nr & 0xf));
                 }
         }
@@ -2330,8 +2325,6 @@ static void set_rx_mode(struct net_device *net_dev)
                 /* restore cr */
                 outl(cr_saved, ioaddr + cr);
         }
-
-        return;
 }
 
 /**