1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/macmace.c b/drivers/net/macmace.c
index 13ba8f4afb7e..c685a4656878 100644
--- a/drivers/net/macmace.c
+++ b/drivers/net/macmace.c
@@ -30,6 +30,7 @@
 #include <linux/bitrev.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
+#include <linux/gfp.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/macintosh.h>
@@ -487,7 +488,6 @@ static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev)
 
         dev_kfree_skb(skb);
 
-        dev->trans_start = jiffies;
         return NETDEV_TX_OK;
 }
 
@@ -508,7 +508,7 @@ static void mace_set_multicast(struct net_device *dev)
                 mb->maccc |= PROM;
         } else {
                 unsigned char multicast_filter[8];
-                struct dev_mc_list *dmi;
+                struct netdev_hw_addr *ha;
 
                 if (dev->flags & IFF_ALLMULTI) {
                         for (i = 0; i < 8; i++) {
@@ -517,8 +517,8 @@ static void mace_set_multicast(struct net_device *dev)
                 } else {
                         for (i = 0; i < 8; i++)
                                 multicast_filter[i] = 0;
-                        netdev_for_each_mc_addr(dmi, dev) {
-                                crc = ether_crc_le(6, dmi->dmi_addr);
+                        netdev_for_each_mc_addr(ha, dev) {
+                                crc = ether_crc_le(6, ha->addr);
                                 /* bit number in multicast_filter */
                                 i = crc >> 26;
                                 multicast_filter[i >> 3] |= 1 << (i & 7);