aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/xirc2ps_cs.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/pcmcia/xirc2ps_cs.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/pcmcia/xirc2ps_cs.c')
-rw-r--r--drivers/net/pcmcia/xirc2ps_cs.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index 656be931207a..6622f0401794 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -1295,7 +1295,7 @@ xirc2ps_tx_timeout_task(struct work_struct *work)
1295 struct net_device *dev = local->dev; 1295 struct net_device *dev = local->dev;
1296 /* reset the card */ 1296 /* reset the card */
1297 do_reset(dev,1); 1297 do_reset(dev,1);
1298 dev->trans_start = jiffies; 1298 dev->trans_start = jiffies; /* prevent tx timeout */
1299 netif_wake_queue(dev); 1299 netif_wake_queue(dev);
1300} 1300}
1301 1301
@@ -1358,7 +1358,6 @@ do_start_xmit(struct sk_buff *skb, struct net_device *dev)
1358 PutByte(XIRCREG_CR, TransmitPacket|EnableIntr); 1358 PutByte(XIRCREG_CR, TransmitPacket|EnableIntr);
1359 1359
1360 dev_kfree_skb (skb); 1360 dev_kfree_skb (skb);
1361 dev->trans_start = jiffies;
1362 dev->stats.tx_bytes += pktlen; 1361 dev->stats.tx_bytes += pktlen;
1363 netif_start_queue(dev); 1362 netif_start_queue(dev);
1364 return NETDEV_TX_OK; 1363 return NETDEV_TX_OK;