diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-05-10 08:01:31 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-10 08:01:31 -0400 |
commit | 1ae5dc342ac78d7a42965fd1f323815f6f5ef2c1 (patch) | |
tree | d1955a7639e99832590df26466a34d5786a880ae /drivers/net/arm/w90p910_ether.c | |
parent | 2b0b05ddc04b6d45e71cd36405df512075786f1e (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/arm/w90p910_ether.c')
-rw-r--r-- | drivers/net/arm/w90p910_ether.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/arm/w90p910_ether.c b/drivers/net/arm/w90p910_ether.c index 2491934b73e8..2e852463382b 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) | |||
483 | 483 | ||
484 | w90p910_init_desc(dev); | 484 | w90p910_init_desc(dev); |
485 | 485 | ||
486 | dev->trans_start = jiffies; | 486 | dev->trans_start = jiffies; /* prevent tx timeout */ |
487 | ether->cur_tx = 0x0; | 487 | ether->cur_tx = 0x0; |
488 | ether->finish_tx = 0x0; | 488 | ether->finish_tx = 0x0; |
489 | ether->cur_rx = 0x0; | 489 | ether->cur_rx = 0x0; |
@@ -497,7 +497,7 @@ static void w90p910_reset_mac(struct net_device *dev) | |||
497 | w90p910_trigger_tx(dev); | 497 | w90p910_trigger_tx(dev); |
498 | w90p910_trigger_rx(dev); | 498 | w90p910_trigger_rx(dev); |
499 | 499 | ||
500 | dev->trans_start = jiffies; | 500 | dev->trans_start = jiffies; /* prevent tx timeout */ |
501 | 501 | ||
502 | if (netif_queue_stopped(dev)) | 502 | if (netif_queue_stopped(dev)) |
503 | netif_wake_queue(dev); | 503 | netif_wake_queue(dev); |
@@ -634,8 +634,6 @@ static int w90p910_send_frame(struct net_device *dev, | |||
634 | 634 | ||
635 | txbd = ðer->tdesc->desclist[ether->cur_tx]; | 635 | txbd = ðer->tdesc->desclist[ether->cur_tx]; |
636 | 636 | ||
637 | dev->trans_start = jiffies; | ||
638 | |||
639 | if (txbd->mode & TX_OWEN_DMA) | 637 | if (txbd->mode & TX_OWEN_DMA) |
640 | netif_stop_queue(dev); | 638 | netif_stop_queue(dev); |
641 | 639 | ||