1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c
index 54662f24f9bb..8da87383fb39 100644
--- a/drivers/net/atlx/atl2.c
+++ b/drivers/net/atlx/atl2.c
@@ -136,7 +136,7 @@ static void atl2_set_multi(struct net_device *netdev)
 {
         struct atl2_adapter *adapter = netdev_priv(netdev);
         struct atl2_hw *hw = &adapter->hw;
-        struct dev_mc_list *mc_ptr;
+        struct netdev_hw_addr *ha;
         u32 rctl;
         u32 hash_value;
 
@@ -158,8 +158,8 @@ static void atl2_set_multi(struct net_device *netdev)
         ATL2_WRITE_REG_ARRAY(hw, REG_RX_HASH_TABLE, 1, 0);
 
         /* comoute mc addresses' hash value ,and put it into hash table */
-        netdev_for_each_mc_addr(mc_ptr, netdev) {
-                hash_value = atl2_hash_mc_addr(hw, mc_ptr->dmi_addr);
+        netdev_for_each_mc_addr(ha, netdev) {
+                hash_value = atl2_hash_mc_addr(hw, ha->addr);
                 atl2_hash_set(hw, hash_value);
         }
 }
@@ -422,7 +422,6 @@ static void atl2_intr_rx(struct atl2_adapter *adapter)
                                 netdev->stats.rx_dropped++;
                                 break;
                         }
-                        skb->dev = netdev;
                         memcpy(skb->data, rxd->packet, rx_size);
                         skb_put(skb, rx_size);
                         skb->protocol = eth_type_trans(skb, netdev);
@@ -893,7 +892,6 @@ static netdev_tx_t atl2_xmit_frame(struct sk_buff *skb,
                 (adapter->txd_write_ptr >> 2));
 
         mmiowb();
-        netdev->trans_start = jiffies;
         dev_kfree_skb_any(skb);
         return NETDEV_TX_OK;
 }