diff --git a/[refs] b/[refs] index d489073b326b..e6489b785aa2 100644 --- 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 index cc6b391479ca..abc79076f867 100644 --- 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);