diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-24 21:52:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-24 21:52:27 +0100 |
| commit | 87b203079ed949de52f0d92aeae20e5e0116c12f (patch) | |
| tree | 1878756f936963822ed2d51a15db1da5814973e7 /drivers/net/gianfar.c | |
| parent | 58105ef1857112a186696c9b8957020090226a28 (diff) | |
| parent | a852cbfaaf8122827602027b1614971cfd832304 (diff) | |
Merge branch 'x86/core' into core/percpu
Diffstat (limited to 'drivers/net/gianfar.c')
| -rw-r--r-- | drivers/net/gianfar.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index acae2d8cd688..9b12a13a640f 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -1629,6 +1629,12 @@ static void gfar_schedule_cleanup(struct net_device *dev) if (netif_rx_schedule_prep(&priv->napi)) { gfar_write(&priv->regs->imask, IMASK_RTX_DISABLED); __netif_rx_schedule(&priv->napi); + } else { + /* + * Clear IEVENT, so interrupts aren't called again + * because of the packets that have already arrived. + */ + gfar_write(&priv->regs->ievent, IEVENT_RTX_MASK); } spin_unlock(&priv->rxlock); |