]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
8139cp: fix missing napi_gro_flush.
authorfrançois romieu <romieu@fr.zoreil.com>
Sun, 8 Jan 2012 13:41:33 +0000 (13:41 +0000)
committerJoe Jin <joe.jin@oracle.com>
Fri, 18 May 2012 03:18:33 +0000 (11:18 +0800)
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.

(cherry picked from commit b189e810619a676e6b931a942a3e8387f3d39c21)
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>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/8139cp.c

index f28f25681cef0d6b013e689ec312cc153a4eea90..29989d20cf948c4960f2914a83c579fe81b541fb 100644 (file)
@@ -595,6 +595,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);