1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/net/arm/w90p910_ether.c b/drivers/net/arm/w90p910_ether.c
index f7c9ca1dfb17..2e852463382b 100644
--- a/drivers/net/arm/w90p910_ether.c
+++ b/drivers/net/arm/w90p910_ether.c
@@ -483,7 +483,7 @@ static void w90p910_reset_mac(struct net_device *dev)
 
         w90p910_init_desc(dev);
 
-        dev->trans_start = jiffies;
+        dev->trans_start = jiffies; /* prevent tx timeout */
         ether->cur_tx = 0x0;
         ether->finish_tx = 0x0;
         ether->cur_rx = 0x0;
@@ -497,7 +497,7 @@ static void w90p910_reset_mac(struct net_device *dev)
         w90p910_trigger_tx(dev);
         w90p910_trigger_rx(dev);
 
-        dev->trans_start = jiffies;
+        dev->trans_start = jiffies; /* prevent tx timeout */
 
         if (netif_queue_stopped(dev))
                 netif_wake_queue(dev);
@@ -634,8 +634,6 @@ static int w90p910_send_frame(struct net_device *dev,
 
         txbd = &ether->tdesc->desclist[ether->cur_tx];
 
-        dev->trans_start = jiffies;
-
         if (txbd->mode & TX_OWEN_DMA)
                 netif_stop_queue(dev);
 
@@ -744,7 +742,6 @@ static void netdev_rx(struct net_device *dev)
                                 return;
                         }
 
-                        skb->dev = dev;
                         skb_reserve(skb, 2);
                         skb_put(skb, length);
                         skb_copy_to_linear_data(skb, data, length);