aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can
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/can
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/can')
-rw-r--r--drivers/net/can/at91_can.c1
-rw-r--r--drivers/net/can/bfin_can.c2
-rw-r--r--drivers/net/can/mcp251x.c1
-rw-r--r--drivers/net/can/sja1000/sja1000.c2
4 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index 5f983487d6e4..2d8bd86bc5e2 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -375,7 +375,6 @@ static netdev_tx_t at91_start_xmit(struct sk_buff *skb, struct net_device *dev)
375 at91_write(priv, AT91_MCR(mb), reg_mcr); 375 at91_write(priv, AT91_MCR(mb), reg_mcr);
376 376
377 stats->tx_bytes += cf->can_dlc; 377 stats->tx_bytes += cf->can_dlc;
378 dev->trans_start = jiffies;
379 378
380 /* _NOTE_: substract AT91_MB_TX_FIRST offset from mb! */ 379 /* _NOTE_: substract AT91_MB_TX_FIRST offset from mb! */
381 can_put_echo_skb(skb, dev, mb - AT91_MB_TX_FIRST); 380 can_put_echo_skb(skb, dev, mb - AT91_MB_TX_FIRST);
diff --git a/drivers/net/can/bfin_can.c b/drivers/net/can/bfin_can.c
index d77264ad326d..b6e890d28366 100644
--- a/drivers/net/can/bfin_can.c
+++ b/drivers/net/can/bfin_can.c
@@ -269,8 +269,6 @@ static int bfin_can_start_xmit(struct sk_buff *skb, struct net_device *dev)
269 /* fill data length code */ 269 /* fill data length code */
270 bfin_write16(&reg->chl[TRANSMIT_CHL].dlc, dlc); 270 bfin_write16(&reg->chl[TRANSMIT_CHL].dlc, dlc);
271 271
272 dev->trans_start = jiffies;
273
274 can_put_echo_skb(skb, dev, 0); 272 can_put_echo_skb(skb, dev, 0);
275 273
276 /* set transmit request */ 274 /* set transmit request */
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c
index 8431eb08075d..b11a0cb5ed81 100644
--- a/drivers/net/can/mcp251x.c
+++ b/drivers/net/can/mcp251x.c
@@ -475,7 +475,6 @@ static netdev_tx_t mcp251x_hard_start_xmit(struct sk_buff *skb,
475 475
476 netif_stop_queue(net); 476 netif_stop_queue(net);
477 priv->tx_skb = skb; 477 priv->tx_skb = skb;
478 net->trans_start = jiffies;
479 queue_work(priv->wq, &priv->tx_work); 478 queue_work(priv->wq, &priv->tx_work);
480 479
481 return NETDEV_TX_OK; 480 return NETDEV_TX_OK;
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
index 618c11222abc..24b58619f7c1 100644
--- a/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@ -292,8 +292,6 @@ static netdev_tx_t sja1000_start_xmit(struct sk_buff *skb,
292 for (i = 0; i < dlc; i++) 292 for (i = 0; i < dlc; i++)
293 priv->write_reg(priv, dreg++, cf->data[i]); 293 priv->write_reg(priv, dreg++, cf->data[i]);
294 294
295 dev->trans_start = jiffies;
296
297 can_put_echo_skb(skb, dev, 0); 295 can_put_echo_skb(skb, dev, 0);
298 296
299 priv->write_reg(priv, REG_CMR, CMD_TR); 297 priv->write_reg(priv, REG_CMR, CMD_TR);