aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ni5010.c
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2010-05-10 08:01:31 -0400
committerDavid S. Miller <davem@davemloft.net>2010-05-10 08:01:31 -0400
commit1ae5dc342ac78d7a42965fd1f323815f6f5ef2c1 (patch)
treed1955a7639e99832590df26466a34d5786a880ae /drivers/net/ni5010.c
parent2b0b05ddc04b6d45e71cd36405df512075786f1e (diff)
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>
Diffstat (limited to 'drivers/net/ni5010.c')
-rw-r--r--drivers/net/ni5010.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c
index 3892330f244a..f80b50159114 100644
--- a/drivers/net/ni5010.c
+++ b/drivers/net/ni5010.c
@@ -444,7 +444,7 @@ static void ni5010_timeout(struct net_device *dev)
444 /* Try to restart the adaptor. */ 444 /* Try to restart the adaptor. */
445 /* FIXME: Give it a real kick here */ 445 /* FIXME: Give it a real kick here */
446 chipset_init(dev, 1); 446 chipset_init(dev, 1);
447 dev->trans_start = jiffies; 447 dev->trans_start = jiffies; /* prevent tx timeout */
448 netif_wake_queue(dev); 448 netif_wake_queue(dev);
449} 449}
450 450
@@ -460,7 +460,6 @@ static int ni5010_send_packet(struct sk_buff *skb, struct net_device *dev)
460 460
461 netif_stop_queue(dev); 461 netif_stop_queue(dev);
462 hardware_send_packet(dev, (unsigned char *)skb->data, skb->len, length-skb->len); 462 hardware_send_packet(dev, (unsigned char *)skb->data, skb->len, length-skb->len);
463 dev->trans_start = jiffies;
464 dev_kfree_skb (skb); 463 dev_kfree_skb (skb);
465 return NETDEV_TX_OK; 464 return NETDEV_TX_OK;
466} 465}