1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index 98d818daa77e..22bde49262c0 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -881,8 +881,6 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)
         wmb();
         iowrite32(txRing->lastWrite, tp->tx_ioaddr + txRing->writeRegister);
 
-        dev->trans_start = jiffies;
-
         /* If we don't have room to put the worst case packet on the
          * queue, then we must stop the queue. We need 2 extra
          * descriptors -- one to prevent ring wrap, and one for the
@@ -920,11 +918,11 @@ typhoon_set_rx_mode(struct net_device *dev)
                 /* Too many to match, or accept all multicasts. */
                 filter |= TYPHOON_RX_FILTER_ALL_MCAST;
         } else if (!netdev_mc_empty(dev)) {
-                struct dev_mc_list *mclist;
+                struct netdev_hw_addr *ha;
 
                 memset(mc_filter, 0, sizeof(mc_filter));
-                netdev_for_each_mc_addr(mclist, dev) {
-                        int bit = ether_crc(ETH_ALEN, mclist->dmi_addr) & 0x3f;
+                netdev_for_each_mc_addr(ha, dev) {
+                        int bit = ether_crc(ETH_ALEN, ha->addr) & 0x3f;
                         mc_filter[bit >> 5] |= 1 << (bit & 0x1f);
                 }