mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
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>
This commit is contained in:
parent
b46a8454cd
commit
12dea57be5
2 changed files with 15 additions and 13 deletions
|
@ -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);
|
||||
|
|
|
@ -462,11 +462,12 @@ static int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rva
|
|||
spin_lock(&priv->rxlock);
|
||||
|
||||
gfar_halt(dev);
|
||||
gfar_clean_rx_ring(dev, priv->rx_ring_size);
|
||||
|
||||
spin_unlock(&priv->rxlock);
|
||||
spin_unlock_irqrestore(&priv->txlock, flags);
|
||||
|
||||
gfar_clean_rx_ring(dev, priv->rx_ring_size);
|
||||
|
||||
/* Now we take down the rings to rebuild them */
|
||||
stop_gfar(dev);
|
||||
}
|
||||
|
@ -476,9 +477,10 @@ static int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rva
|
|||
priv->tx_ring_size = rvals->tx_pending;
|
||||
|
||||
/* Rebuild the rings with the new size */
|
||||
if (dev->flags & IFF_UP)
|
||||
if (dev->flags & IFF_UP) {
|
||||
err = startup_gfar(dev);
|
||||
|
||||
netif_wake_queue(dev);
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
|
@ -498,11 +500,12 @@ static int gfar_set_rx_csum(struct net_device *dev, uint32_t data)
|
|||
spin_lock(&priv->rxlock);
|
||||
|
||||
gfar_halt(dev);
|
||||
gfar_clean_rx_ring(dev, priv->rx_ring_size);
|
||||
|
||||
spin_unlock(&priv->rxlock);
|
||||
spin_unlock_irqrestore(&priv->txlock, flags);
|
||||
|
||||
gfar_clean_rx_ring(dev, priv->rx_ring_size);
|
||||
|
||||
/* Now we take down the rings to rebuild them */
|
||||
stop_gfar(dev);
|
||||
}
|
||||
|
@ -511,9 +514,10 @@ static int gfar_set_rx_csum(struct net_device *dev, uint32_t data)
|
|||
priv->rx_csum_enable = data;
|
||||
spin_unlock_irqrestore(&priv->bflock, flags);
|
||||
|
||||
if (dev->flags & IFF_UP)
|
||||
if (dev->flags & IFF_UP) {
|
||||
err = startup_gfar(dev);
|
||||
|
||||
netif_wake_queue(dev);
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
|
@ -529,22 +533,19 @@ static uint32_t gfar_get_rx_csum(struct net_device *dev)
|
|||
|
||||
static int gfar_set_tx_csum(struct net_device *dev, uint32_t data)
|
||||
{
|
||||
unsigned long flags;
|
||||
struct gfar_private *priv = netdev_priv(dev);
|
||||
|
||||
if (!(priv->device_flags & FSL_GIANFAR_DEV_HAS_CSUM))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
spin_lock_irqsave(&priv->txlock, flags);
|
||||
gfar_halt(dev);
|
||||
netif_tx_lock_bh(dev);
|
||||
|
||||
if (data)
|
||||
dev->features |= NETIF_F_IP_CSUM;
|
||||
else
|
||||
dev->features &= ~NETIF_F_IP_CSUM;
|
||||
|
||||
gfar_start(dev);
|
||||
spin_unlock_irqrestore(&priv->txlock, flags);
|
||||
netif_tx_unlock_bh(dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue