From: françois romieu <romieu@fr.zoreil.com>
Date: Sun, 8 Jan 2012 13:41:33 +0000 (+0000)
Subject: 8139cp: fix missing napi_gro_flush.
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~26
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=00f137ce3eb449ebcae7e7e042ba46f561b3cb50;p=users%2Fjedix%2Flinux-maple.git

8139cp: fix missing napi_gro_flush.

The driver uses __napi_complete and napi_gro_receive. Without it, the
driver hits the BUG_ON(n->gro_list) assertion hard in __napi_complete.

(cherry picked from commit b189e810619a676e6b931a942a3e8387f3d39c21)
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Tested-by: Marin Glibic <zhilla2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index f28f25681cef..29989d20cf94 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -595,6 +595,7 @@ rx_next:
 		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);