aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/gianfar.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/gianfar.c')
-rw-r--r--drivers/net/gianfar.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 5267c27e3174..11d8cae415e5 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -1738,7 +1738,7 @@ void gfar_start(struct net_device *dev)
1738 gfar_write(&regs->imask, IMASK_DEFAULT); 1738 gfar_write(&regs->imask, IMASK_DEFAULT);
1739 } 1739 }
1740 1740
1741 dev->trans_start = jiffies; 1741 dev->trans_start = jiffies; /* prevent tx timeout */
1742} 1742}
1743 1743
1744void gfar_configure_coalescing(struct gfar_private *priv, 1744void gfar_configure_coalescing(struct gfar_private *priv,
@@ -2161,8 +2161,6 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
2161 /* reduce TxBD free count */ 2161 /* reduce TxBD free count */
2162 tx_queue->num_txbdfree -= (nr_txbds); 2162 tx_queue->num_txbdfree -= (nr_txbds);
2163 2163
2164 dev->trans_start = jiffies;
2165
2166 /* If the next BD still needs to be cleaned up, then the bds 2164 /* If the next BD still needs to be cleaned up, then the bds
2167 are full. We need to tell the kernel to stop sending us stuff. */ 2165 are full. We need to tell the kernel to stop sending us stuff. */
2168 if (!tx_queue->num_txbdfree) { 2166 if (!tx_queue->num_txbdfree) {