net: trans_start cleanups

Now that core network takes care of trans_start updates, dont do it
in drivers themselves, if possible. Drivers can avoid one cache miss
(on dev->trans_start) in their start_xmit() handler.

Exceptions are NETIF_F_LLTX drivers

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

8 files changed, 2 insertions, 13 deletions

diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c
index a4b5b08276f..8c496fb1ac9 100644
--- a/drivers/net/arm/am79c961a.c
+++ b/drivers/net/arm/am79c961a.c
@@ -469,7 +469,6 @@ am79c961_sendpacket(struct sk_buff *skb, struct net_device *dev)
 
         spin_lock_irqsave(&priv->chip_lock, flags);
         write_rreg (dev->base_addr, CSR0, CSR0_TDMD|CSR0_IENA);
-        dev->trans_start = jiffies;
         spin_unlock_irqrestore(&priv->chip_lock, flags);
 
         /*
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c
index 0adab30f626..e07b314ed8f 100644
--- a/drivers/net/arm/at91_ether.c
+++ b/drivers/net/arm/at91_ether.c
@@ -824,7 +824,6 @@ static int at91ether_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 /* Set length of the packet in the Transmit Control register */
                 at91_emac_write(AT91_EMAC_TCR, skb->len);
 
-                dev->trans_start = jiffies;
         } else {
                 printk(KERN_ERR "at91_ether.c: at91ether_start_xmit() called, but device is busy!\n");
                 return NETDEV_TX_BUSY;  /* if we return anything but zero, dev.c:1055 calls kfree_skb(skb)
diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/arm/ep93xx_eth.c
index 6995169d285..c5f6736b7d6 100644
--- a/drivers/net/arm/ep93xx_eth.c
+++ b/drivers/net/arm/ep93xx_eth.c
@@ -374,8 +374,6 @@ static int ep93xx_xmit(struct sk_buff *skb, struct net_device *dev)
                                 skb->len, DMA_TO_DEVICE);
         dev_kfree_skb(skb);
 
-        dev->trans_start = jiffies;
-
         spin_lock_irq(&ep->tx_pending_lock);
         ep->tx_pending++;
         if (ep->tx_pending == TX_QUEUE_ENTRIES)
diff --git a/drivers/net/arm/ether1.c b/drivers/net/arm/ether1.c
index e47c0d96285..b17ab5153f5 100644
--- a/drivers/net/arm/ether1.c
+++ b/drivers/net/arm/ether1.c
@@ -736,7 +736,6 @@ ether1_sendpacket (struct sk_buff *skb, struct net_device *dev)
         local_irq_restore(flags);
 
         /* handle transmit */
-        dev->trans_start = jiffies;
 
         /* check to see if we have room for a full sized ether frame */
         tmp = priv(dev)->tx_head;
diff --git a/drivers/net/arm/ether3.c b/drivers/net/arm/ether3.c
index d9de9bce239..1361b7367c2 100644
--- a/drivers/net/arm/ether3.c
+++ b/drivers/net/arm/ether3.c
@@ -529,7 +529,6 @@ ether3_sendpacket(struct sk_buff *skb, struct net_device *dev)
                 return NETDEV_TX_BUSY;  /* unable to queue */
         }
 
-        dev->trans_start = jiffies;
         ptr              = 0x600 * priv(dev)->tx_head;
         priv(dev)->tx_head = next_ptr;
         next_ptr        *= 0x600;
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c
index 7800d7dfd29..24df0325090 100644
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
@@ -708,7 +708,6 @@ static int eth_xmit(struct sk_buff *skb, struct net_device *dev)
         /* NPE firmware pads short frames with zeros internally */
         wmb();
         queue_put_desc(TX_QUEUE(port->id), tx_desc_phys(port, n), desc);
-        dev->trans_start = jiffies;
 
         if (qmgr_stat_below_low_watermark(txreadyq)) { /* empty */
 #if DEBUG_TX
diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c
index 6404704f7ea..54c6d849cf2 100644
--- a/drivers/net/arm/ks8695net.c
+++ b/drivers/net/arm/ks8695net.c
@@ -1302,8 +1302,6 @@ ks8695_start_xmit(struct sk_buff *skb, struct net_device *ndev)
         if (++ksp->tx_ring_used == MAX_TX_DESC)
                 netif_stop_queue(ndev);
 
-        ndev->trans_start = jiffies;
-
         /* Kick the TX DMA in case it decided to go IDLE */
         ks8695_writereg(ksp, KS8695_DTSC, 0);
 
diff --git a/drivers/net/arm/w90p910_ether.c b/drivers/net/arm/w90p910_ether.c
index 2491934b73e..2e852463382 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);