---

yaml --- r: 281965 b: refs/heads/master c: b189e81 h: refs/heads/master i: 281963: 3400156 v: v3
git-mirror · Jan 9, 2012 · 80931f6 · 80931f6
1 parent 074cb22
commit 80931f6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26e29eeda048aa6699984c4b9d6997dd1a1315db
+refs/heads/master: b189e810619a676e6b931a942a3e8387f3d39c21
diff --git a/trunk/drivers/net/ethernet/realtek/8139cp.c b/trunk/drivers/net/ethernet/realtek/8139cp.c
@@ -563,6 +563,7 @@ static int cp_rx_poll(struct napi_struct *napi, int budget)
 		if (cpr16(IntrStatus) & cp_rx_intr_mask)
 			goto rx_status_loop;
 
+		napi_gro_flush(napi);
 		spin_lock_irqsave(&cp->lock, flags);
 		__napi_complete(napi);
 		cpw16_f(IntrMask, cp_intr_mask);