aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/at1700.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/at1700.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/at1700.c')
-rw-r--r--drivers/net/at1700.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index 332f9806b78e..861f07a775fb 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -583,7 +583,7 @@ static void net_tx_timeout (struct net_device *dev)
583 outb (0x00, ioaddr + TX_START); 583 outb (0x00, ioaddr + TX_START);
584 outb (0x03, ioaddr + COL16CNTL); 584 outb (0x03, ioaddr + COL16CNTL);
585 585
586 dev->trans_start = jiffies; 586 dev->trans_start = jiffies; /* prevent tx timeout */
587 587
588 lp->tx_started = 0; 588 lp->tx_started = 0;
589 lp->tx_queue_ready = 1; 589 lp->tx_queue_ready = 1;
@@ -636,7 +636,6 @@ static netdev_tx_t net_send_packet (struct sk_buff *skb,
636 outb (0x80 | lp->tx_queue, ioaddr + TX_START); 636 outb (0x80 | lp->tx_queue, ioaddr + TX_START);
637 lp->tx_queue = 0; 637 lp->tx_queue = 0;
638 lp->tx_queue_len = 0; 638 lp->tx_queue_len = 0;
639 dev->trans_start = jiffies;
640 lp->tx_started = 1; 639 lp->tx_started = 1;
641 netif_start_queue (dev); 640 netif_start_queue (dev);
642 } else if (lp->tx_queue_len < 4096 - 1502) 641 } else if (lp->tx_queue_len < 4096 - 1502)