1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c
index 1921a54ea995..91adc38d5710 100644
--- a/drivers/net/skfp/skfddi.c
+++ b/drivers/net/skfp/skfddi.c
@@ -78,13 +78,13 @@ static const char * const boot_msg =
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
-#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/netdevice.h>
 #include <linux/fddidevice.h>
 #include <linux/skbuff.h>
 #include <linux/bitops.h>
+#include <linux/gfp.h>
 
 #include <asm/byteorder.h>
 #include <asm/io.h>
@@ -852,7 +852,7 @@ static void skfp_ctl_set_multicast_list(struct net_device *dev)
 static void skfp_ctl_set_multicast_list_wo_lock(struct net_device *dev)
 {
         struct s_smc *smc = netdev_priv(dev);
-        struct dev_mc_list *dmi;
+        struct netdev_hw_addr *ha;
 
         /* Enable promiscuous mode, if necessary */
         if (dev->flags & IFF_PROMISC) {
@@ -876,13 +876,13 @@ static void skfp_ctl_set_multicast_list_wo_lock(struct net_device *dev)
                                 /* use exact filtering */
 
                                 // point to first multicast addr
-                                netdev_for_each_mc_addr(dmi, dev) {
-                                        mac_add_multicast(smc, 
-                                                          (struct fddi_addr *)dmi->dmi_addr, 
-                                                          1);
+                                netdev_for_each_mc_addr(ha, dev) {
+                                        mac_add_multicast(smc,
+                                                (struct fddi_addr *)ha->addr,
+                                                1);
 
                                         pr_debug(KERN_INFO "ENABLE MC ADDRESS: %pMF\n",
-                                                dmi->dmi_addr);
+                                                ha->addr);
                                 }
 
                         } else {        // more MC addresses than HW supports
@@ -1076,7 +1076,6 @@ static netdev_tx_t skfp_send_pkt(struct sk_buff *skb,
         if (bp->QueueSkb == 0) {
                 netif_stop_queue(dev);
         }
-        dev->trans_start = jiffies;
         return NETDEV_TX_OK;
 
 }                               // skfp_send_pkt