diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-05-28 02:00:41 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-29 10:46:27 +0200 |
| commit | cdd0db058d64f2619b08e7d098ee0014aa0a5bc1 (patch) | |
| tree | a5e31f6687eff581309b095781c7e2f0bc676182 /drivers/net/dl2k.c | |
| parent | net: dont update dev->trans_start in 10GB drivers (diff) | |
| download | linux-cdd0db058d64f2619b08e7d098ee0014aa0a5bc1.tar.xz linux-cdd0db058d64f2619b08e7d098ee0014aa0a5bc1.zip | |
net: dont update dev->trans_start
Second round of drivers for Gb cards (and NIU one I forgot in the 10GB round)
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/dl2k.c')
| -rw-r--r-- | drivers/net/dl2k.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c index 4a1b554654eb..895d72143ee0 100644 --- a/drivers/net/dl2k.c +++ b/drivers/net/dl2k.c @@ -539,7 +539,7 @@ rio_tx_timeout (struct net_device *dev) dev->name, readl (ioaddr + TxStatus)); rio_free_tx(dev, 0); dev->if_port = 0; - dev->trans_start = jiffies; + dev->trans_start = jiffies; /* prevent tx timeout */ } /* allocate and initialize Tx and Rx descriptors */ @@ -610,7 +610,7 @@ start_xmit (struct sk_buff *skb, struct net_device *dev) if (np->link_status == 0) { /* Link Down */ dev_kfree_skb(skb); - return 0; + return NETDEV_TX_OK; } ioaddr = dev->base_addr; entry = np->cur_tx % TX_RING_SIZE; @@ -665,9 +665,7 @@ start_xmit (struct sk_buff *skb, struct net_device *dev) writel (0, dev->base_addr + TFDListPtr1); } - /* NETDEV WATCHDOG timer */ - dev->trans_start = jiffies; - return 0; + return NETDEV_TX_OK; } static irqreturn_t |