diff options
author | françois romieu <romieu@fr.zoreil.com> | 2012-01-08 08:41:33 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-01-08 22:20:33 -0500 |
commit | b189e810619a676e6b931a942a3e8387f3d39c21 (patch) | |
tree | 5efd2b54dd6b879442d780e3f417d5cf1767f94b /drivers/net/ethernet/realtek | |
parent | 26e29eeda048aa6699984c4b9d6997dd1a1315db (diff) |
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.
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>
Diffstat (limited to 'drivers/net/ethernet/realtek')
-rw-r--r-- | 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 cc6b391479ca..abc79076f867 100644 --- a/drivers/net/ethernet/realtek/8139cp.c +++ b/drivers/net/ethernet/realtek/8139cp.c | |||
@@ -563,6 +563,7 @@ rx_next: | |||
563 | if (cpr16(IntrStatus) & cp_rx_intr_mask) | 563 | if (cpr16(IntrStatus) & cp_rx_intr_mask) |
564 | goto rx_status_loop; | 564 | goto rx_status_loop; |
565 | 565 | ||
566 | napi_gro_flush(napi); | ||
566 | spin_lock_irqsave(&cp->lock, flags); | 567 | spin_lock_irqsave(&cp->lock, flags); |
567 | __napi_complete(napi); | 568 | __napi_complete(napi); |
568 | cpw16_f(IntrMask, cp_intr_mask); | 569 | cpw16_f(IntrMask, cp_intr_mask); |