On Fri, Feb 03, 2012 at 09:34:24AM +0100, Marin Glibic wrote: > On 02.02.2012 10:15, Francois Romieu wrote: > >Commit b189e810619a676e6b931a942a3e8387f3d39c21 upstream. > > > >Fixes 6864ddb2d3089739d29418a1ff52adb2fbf9c0ca. > > > >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<[email protected]> > >Tested-by: Marin Glibic<[email protected]> > >Signed-off-by: David S. Miller<[email protected]> > >--- > > > > The regression appeared between 3.0 and 3.1. Should the same patch be > > sent and take into account the pre-3.2 ethernet network devices move ? > > > > drivers/net/ethernet/realtek/8139cp.c | 1 + > > 1 files changed, 1 insertions(+), 0 deletions(-) > > > >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); > > This prevents crash and is needed in 3.1 and 3.2, not needed for > 3.0, and not tested with 3.3 branch.
Now applied, thanks. greg k-h -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
