Message ID | 20120108234133.GA2785@electric-eye.fr.zoreil.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
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
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);