diff options
| author | Dai Haruki <dai.haruki@freescale.com> | 2008-12-16 15:30:20 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-16 15:30:20 -0800 |
| commit | 12dea57be552a291e93827baeffbb91e33f587a6 (patch) | |
| tree | dba9874cf9a930a729aac0f30f7fe50824b9e76a /drivers/net/gianfar.c | |
| parent | b46a8454cd304b5376ba00d3457a612720e47269 (diff) | |
| download | blackbird-op-linux-12dea57be552a291e93827baeffbb91e33f587a6.tar.gz blackbird-op-linux-12dea57be552a291e93827baeffbb91e33f587a6.zip | |
gianfar: Fix eTSEC configuration procedure
Fix some bugs in the ethtool configuration functions:
* gfar_clean_rx_ring should not be called with interrupts disabled.
* Update last transmission time to avoid tx timeout.
* Delete redundant NETIF_F_IP_CSUM check in gfar_start_xmit
* Use netif_tx_lock_bh when reconfiguring the tx csum
Signed-off-by: Dai Haruki <dai.haruki@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
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) /* Unmask the interrupts we look for */ gfar_write(®s->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); |
