diff options
Diffstat (limited to 'drivers/net/declance.c')
-rw-r--r-- | drivers/net/declance.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/declance.c b/drivers/net/declance.c index fb3f0984c289..74abe195212c 100644 --- a/drivers/net/declance.c +++ b/drivers/net/declance.c | |||
@@ -874,7 +874,7 @@ static inline int lance_reset(struct net_device *dev) | |||
874 | 874 | ||
875 | lance_init_ring(dev); | 875 | lance_init_ring(dev); |
876 | load_csrs(lp); | 876 | load_csrs(lp); |
877 | dev->trans_start = jiffies; | 877 | dev->trans_start = jiffies; /* prevent tx timeout */ |
878 | status = init_restart_lance(lp); | 878 | status = init_restart_lance(lp); |
879 | return status; | 879 | return status; |
880 | } | 880 | } |
@@ -930,7 +930,6 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
930 | 930 | ||
931 | spin_unlock_irqrestore(&lp->lock, flags); | 931 | spin_unlock_irqrestore(&lp->lock, flags); |
932 | 932 | ||
933 | dev->trans_start = jiffies; | ||
934 | dev_kfree_skb(skb); | 933 | dev_kfree_skb(skb); |
935 | 934 | ||
936 | return NETDEV_TX_OK; | 935 | return NETDEV_TX_OK; |