diff options
Diffstat (limited to 'drivers/net/bfin_mac.c')
-rw-r--r-- | drivers/net/bfin_mac.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c index c488cea8f455..b0207f01eb6b 100644 --- a/drivers/net/bfin_mac.c +++ b/drivers/net/bfin_mac.c | |||
@@ -654,7 +654,6 @@ static int bfin_mac_hard_start_xmit(struct sk_buff *skb, | |||
654 | out: | 654 | out: |
655 | adjust_tx_list(); | 655 | adjust_tx_list(); |
656 | current_tx_ptr = current_tx_ptr->next; | 656 | current_tx_ptr = current_tx_ptr->next; |
657 | dev->trans_start = jiffies; | ||
658 | dev->stats.tx_packets++; | 657 | dev->stats.tx_packets++; |
659 | dev->stats.tx_bytes += (skb->len); | 658 | dev->stats.tx_bytes += (skb->len); |
660 | return NETDEV_TX_OK; | 659 | return NETDEV_TX_OK; |
@@ -805,7 +804,7 @@ static void bfin_mac_timeout(struct net_device *dev) | |||
805 | bfin_mac_enable(); | 804 | bfin_mac_enable(); |
806 | 805 | ||
807 | /* We can accept TX packets again */ | 806 | /* We can accept TX packets again */ |
808 | dev->trans_start = jiffies; | 807 | dev->trans_start = jiffies; /* prevent tx timeout */ |
809 | netif_wake_queue(dev); | 808 | netif_wake_queue(dev); |
810 | } | 809 | } |
811 | 810 | ||