---

yaml --- r: 131205 b: refs/heads/master c: 8707bdd h: refs/heads/master i: 131203: 9c4e250 v: v3
git-mirror · Feb 9, 2009 · 82202f5 · 82202f5
1 parent 2981ca4
commit 82202f5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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);