diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-01-22 10:03:02 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-01-22 10:03:02 +0100 |
| commit | 6552ebae25ffd57574c6e72d17fce67fea08b918 (patch) | |
| tree | cde6cc932c7e47d818154b011dfd8a6997d5c18e /drivers/net/gianfar.c | |
| parent | 749a440b2218e9937dca8c68e23e51ca4d8d37fe (diff) | |
| parent | 336f6c322d87806ef93afad6308ac65083a865e5 (diff) | |
Merge branch 'core/debugobjects' into core/urgent
Diffstat (limited to 'drivers/net/gianfar.c')
| -rw-r--r-- | drivers/net/gianfar.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index efcbeb6c867..ea530673236 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -1622,10 +1622,18 @@ static int gfar_clean_tx_ring(struct net_device *dev) static void gfar_schedule_cleanup(struct net_device *dev) { struct gfar_private *priv = netdev_priv(dev); + unsigned long flags; + + spin_lock_irqsave(&priv->txlock, flags); + spin_lock(&priv->rxlock); + if (netif_rx_schedule_prep(&priv->napi)) { gfar_write(&priv->regs->imask, IMASK_RTX_DISABLED); __netif_rx_schedule(&priv->napi); } + + spin_unlock(&priv->rxlock); + spin_unlock_irqrestore(&priv->txlock, flags); } /* Interrupt Handler for Transmit complete */ |