diff options
Diffstat (limited to 'drivers/net/gianfar.c')
-rw-r--r-- | drivers/net/gianfar.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 5100f75238af..19fdf93e0ec2 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
@@ -892,6 +892,8 @@ void gfar_start(struct net_device *dev) | |||
892 | 892 | ||
893 | /* Unmask the interrupts we look for */ | 893 | /* Unmask the interrupts we look for */ |
894 | gfar_write(®s->imask, IMASK_DEFAULT); | 894 | gfar_write(®s->imask, IMASK_DEFAULT); |
895 | |||
896 | dev->trans_start = jiffies; | ||
895 | } | 897 | } |
896 | 898 | ||
897 | /* Bring the controller up and running */ | 899 | /* Bring the controller up and running */ |
@@ -1233,8 +1235,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1233 | status = txbdp->status & TXBD_WRAP; | 1235 | status = txbdp->status & TXBD_WRAP; |
1234 | 1236 | ||
1235 | /* Set up checksumming */ | 1237 | /* Set up checksumming */ |
1236 | if (likely((dev->features & NETIF_F_IP_CSUM) | 1238 | if (CHECKSUM_PARTIAL == skb->ip_summed) { |
1237 | && (CHECKSUM_PARTIAL == skb->ip_summed))) { | ||
1238 | fcb = gfar_add_fcb(skb, txbdp); | 1239 | fcb = gfar_add_fcb(skb, txbdp); |
1239 | status |= TXBD_TOE; | 1240 | status |= TXBD_TOE; |
1240 | gfar_tx_checksum(skb, fcb); | 1241 | gfar_tx_checksum(skb, fcb); |