1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 3d4406b16658..cd63b97f3c68 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -64,6 +64,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
 #include <linux/ethtool.h>
+#include <linux/gfp.h>
 #include <linux/mii.h>
 #include <linux/if_vlan.h>
 #include <linux/crc32.h>
@@ -881,7 +882,6 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb,
         spin_unlock_irqrestore(&cp->lock, intr_flags);
 
         cpw8(TxPoll, NormalTxPoll);
-        dev->trans_start = jiffies;
 
         return NETDEV_TX_OK;
 }
@@ -909,11 +909,11 @@ static void __cp_set_rx_mode (struct net_device *dev)
                 rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
                 mc_filter[1] = mc_filter[0] = 0xffffffff;
         } else {
-                struct dev_mc_list *mclist;
+                struct netdev_hw_addr *ha;
                 rx_mode = AcceptBroadcast | AcceptMyPhys;
                 mc_filter[1] = mc_filter[0] = 0;
-                netdev_for_each_mc_addr(mclist, dev) {
-                        int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26;
+                netdev_for_each_mc_addr(ha, dev) {
+                        int bit_nr = ether_crc(ETH_ALEN, ha->addr) >> 26;
 
                         mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);
                         rx_mode |= AcceptMulticast;