1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c
index 1a0967246e2f..91e6c78271a3 100644
--- a/drivers/net/tokenring/ibmtr.c
+++ b/drivers/net/tokenring/ibmtr.c
@@ -986,7 +986,7 @@ static void open_sap(unsigned char type, struct net_device *dev)
 static void tok_set_multicast_list(struct net_device *dev)
 {
         struct tok_info *ti = netdev_priv(dev);
-        struct dev_mc_list *mclist;
+        struct netdev_hw_addr *ha;
         unsigned char address[4];
 
         int i;
@@ -995,11 +995,11 @@ static void tok_set_multicast_list(struct net_device *dev)
         /*BMS ifconfig tr down or hot unplug a PCMCIA card ??hownowbrowncow*/
         if (/*BMSHELPdev->start == 0 ||*/ ti->open_status != OPEN) return;
         address[0] = address[1] = address[2] = address[3] = 0;
-        netdev_for_each_mc_addr(mclist, dev) {
-                address[0] |= mclist->dmi_addr[2];
-                address[1] |= mclist->dmi_addr[3];
-                address[2] |= mclist->dmi_addr[4];
-                address[3] |= mclist->dmi_addr[5];
+        netdev_for_each_mc_addr(ha, dev) {
+                address[0] |= ha->addr[2];
+                address[1] |= ha->addr[3];
+                address[2] |= ha->addr[4];
+                address[3] |= ha->addr[5];
         }
         SET_PAGE(ti->srb_page);
         for (i = 0; i < sizeof(struct srb_set_funct_addr); i++)
@@ -1041,7 +1041,6 @@ static netdev_tx_t tok_send_packet(struct sk_buff *skb,
         writew(ti->exsap_station_id, ti->srb + STATION_ID_OFST);
         writeb(CMD_IN_SRB, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD);
         spin_unlock_irqrestore(&(ti->lock), flags);
-        dev->trans_start = jiffies;
         return NETDEV_TX_OK;
 }