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/dm9000.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/dm9000.c')
-rw-r--r-- | drivers/net/dm9000.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index a818ea998bb..254b6f724c6 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c | |||
@@ -769,7 +769,7 @@ dm9000_hash_table(struct net_device *dev) | |||
769 | } | 769 | } |
770 | 770 | ||
771 | /* | 771 | /* |
772 | * Initilize dm9000 board | 772 | * Initialize dm9000 board |
773 | */ | 773 | */ |
774 | static void | 774 | static void |
775 | dm9000_init_dm9000(struct net_device *dev) | 775 | dm9000_init_dm9000(struct net_device *dev) |
@@ -825,7 +825,7 @@ dm9000_init_dm9000(struct net_device *dev) | |||
825 | /* Init Driver variable */ | 825 | /* Init Driver variable */ |
826 | db->tx_pkt_cnt = 0; | 826 | db->tx_pkt_cnt = 0; |
827 | db->queue_pkt_len = 0; | 827 | db->queue_pkt_len = 0; |
828 | dev->trans_start = 0; | 828 | dev->trans_start = jiffies; |
829 | } | 829 | } |
830 | 830 | ||
831 | /* Our watchdog timed out. Called by the networking layer */ | 831 | /* Our watchdog timed out. Called by the networking layer */ |
@@ -843,7 +843,7 @@ static void dm9000_timeout(struct net_device *dev) | |||
843 | dm9000_reset(db); | 843 | dm9000_reset(db); |
844 | dm9000_init_dm9000(dev); | 844 | dm9000_init_dm9000(dev); |
845 | /* We can accept TX packets again */ | 845 | /* We can accept TX packets again */ |
846 | dev->trans_start = jiffies; | 846 | dev->trans_start = jiffies; /* prevent tx timeout */ |
847 | netif_wake_queue(dev); | 847 | netif_wake_queue(dev); |
848 | 848 | ||
849 | /* Restore previous register address */ | 849 | /* Restore previous register address */ |