Patchwork 8139cp: fix missing napi_gro_flush.

login
register
mail settings
Submitter françois romieu
Date Jan. 8, 2012, 11:41 p.m.
Message ID <20120108234133.GA2785@electric-eye.fr.zoreil.com>
Download mbox | patch
Permalink /patch/134953/
State Accepted
Delegated to: David Miller
Headers show

Comments

françois romieu - Jan. 8, 2012, 11:41 p.m.
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.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Tested-by: Marin Glibic <zhilla2@gmail.com>
---

 This is a candidate for -stable.

 drivers/net/ethernet/realtek/8139cp.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
David Miller - Jan. 9, 2012, 3:21 a.m.
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Mon, 9 Jan 2012 00:41:33 +0100

> 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.
> 
> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
> Tested-by: Marin Glibic <zhilla2@gmail.com>

Applied, thanks.

> ---
> 
>  This is a candidate for -stable.

Queued up.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
index cc6b391..abc7907 100644
--- a/drivers/net/ethernet/realtek/8139cp.c
+++ b/drivers/net/ethernet/realtek/8139cp.c
@@ -563,6 +563,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);