gianfar: Fix eTSEC configuration procedure

[linux-2.6-omap-h63xx.git] / drivers / net / gianfar.c

diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 5100f75238afc433363e6f81c09c19db5e56b137..19fdf93e0ec209d1abf572d5ca979886db6c6efa 100644 (file)
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -892,6 +892,8 @@ void gfar_start(struct net_device *dev)
 
        /* Unmask the interrupts we look for */
        gfar_write(&regs->imask, IMASK_DEFAULT);
+
+       dev->trans_start = jiffies;
 }
 
 /* Bring the controller up and running */
@@ -1233,8 +1235,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
        status = txbdp->status & TXBD_WRAP;
 
        /* Set up checksumming */
-       if (likely((dev->features & NETIF_F_IP_CSUM)
-                       && (CHECKSUM_PARTIAL == skb->ip_summed))) {
+       if (CHECKSUM_PARTIAL == skb->ip_summed) {
                fcb = gfar_add_fcb(skb, txbdp);
                status |= TXBD_TOE;
                gfar_tx_checksum(skb, fcb);