commit 1ae5dc342ac78d7a42965fd1f323815f6f5ef2c1
author Eric Dumazet <eric.dumazet@gmail.com> Mon May 10 05:01:31 2010 -0700
committer David S. Miller <davem@davemloft.net> Mon May 10 05:01:31 2010 -0700
tree d1955a7639e99832590df26466a34d5786a880ae
parent 2b0b05ddc04b6d45e71cd36405df512075786f1e

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>

drivers/net/tokenring/smctr.c

diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index e405601..213b9af 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -4562,7 +4562,7 @@
          * fake transmission time and go on trying. Our own timeout
          * routine is in sktr_timer_chk()
          */
-        dev->trans_start = jiffies;
+        dev->trans_start = jiffies; /* prevent tx timeout */
         netif_wake_queue(dev);
 }