aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/3c515.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/3c515.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/3c515.c')
-rw-r--r--drivers/net/3c515.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index 2e17837be546..569e269f282e 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -992,7 +992,7 @@ static void corkscrew_timeout(struct net_device *dev)
992 if (!(inw(ioaddr + EL3_STATUS) & CmdInProgress)) 992 if (!(inw(ioaddr + EL3_STATUS) & CmdInProgress))
993 break; 993 break;
994 outw(TxEnable, ioaddr + EL3_CMD); 994 outw(TxEnable, ioaddr + EL3_CMD);
995 dev->trans_start = jiffies; 995 dev->trans_start = jiffies; /* prevent tx timeout */
996 dev->stats.tx_errors++; 996 dev->stats.tx_errors++;
997 dev->stats.tx_dropped++; 997 dev->stats.tx_dropped++;
998 netif_wake_queue(dev); 998 netif_wake_queue(dev);
@@ -1055,7 +1055,6 @@ static netdev_tx_t corkscrew_start_xmit(struct sk_buff *skb,
1055 prev_entry->status &= ~0x80000000; 1055 prev_entry->status &= ~0x80000000;
1056 netif_wake_queue(dev); 1056 netif_wake_queue(dev);
1057 } 1057 }
1058 dev->trans_start = jiffies;
1059 return NETDEV_TX_OK; 1058 return NETDEV_TX_OK;
1060 } 1059 }
1061 /* Put out the doubleword header... */ 1060 /* Put out the doubleword header... */
@@ -1091,7 +1090,6 @@ static netdev_tx_t corkscrew_start_xmit(struct sk_buff *skb,
1091 outw(SetTxThreshold + (1536 >> 2), ioaddr + EL3_CMD); 1090 outw(SetTxThreshold + (1536 >> 2), ioaddr + EL3_CMD);
1092#endif /* bus master */ 1091#endif /* bus master */
1093 1092
1094 dev->trans_start = jiffies;
1095 1093
1096 /* Clear the Tx status stack. */ 1094 /* Clear the Tx status stack. */
1097 { 1095 {