From 82202f536e93a54d7a43cd5df5aa890709371c81 Mon Sep 17 00:00:00 2001 From: Jarek Poplawski Date: Mon, 9 Feb 2009 14:59:30 -0800 Subject: [PATCH] --- yaml --- r: 131205 b: refs/heads/master c: 8707bdd48ab705a459ac1b12014075a139d1d4f9 h: refs/heads/master i: 131203: 9c4e250296f180e4981a38c758ae58f8a0cd15e6 v: v3 --- [refs] | 2 +- trunk/drivers/net/gianfar.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2dc82b5d6b90..029fb5c5a2df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4e2675a61890a84849a24affedf80d5cae8b199 +refs/heads/master: 8707bdd48ab705a459ac1b12014075a139d1d4f9 diff --git a/trunk/drivers/net/gianfar.c b/trunk/drivers/net/gianfar.c index acae2d8cd688..9b12a13a640f 100644 --- a/trunk/drivers/net/gianfar.c +++ b/trunk/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);