diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-02-09 23:22:21 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-09 23:22:21 -0800 |
| commit | 0ecc103aec454288cbaa5a33d8960ab3467e8a11 (patch) | |
| tree | d911ae41c303a575913b8aca2a49f4acaaf0fc93 /drivers/net/gianfar.c | |
| parent | ppp: section fixes re netns (diff) | |
| parent | bridge: Fix LRO crash with tun (diff) | |
| download | linux-dev-0ecc103aec454288cbaa5a33d8960ab3467e8a11.tar.xz linux-dev-0ecc103aec454288cbaa5a33d8960ab3467e8a11.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/gianfar.c
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 802a9516ce41..a64a4385f5a5 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -1668,6 +1668,12 @@ static void gfar_schedule_cleanup(struct net_device *dev) if (napi_schedule_prep(&priv->napi)) { gfar_write(&priv->regs->imask, IMASK_RTX_DISABLED); __napi_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); |