diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-02-07 21:56:51 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-02-07 21:56:51 +0000 |
| commit | 4cca99b95fc7be5f90a94b5b41b45c5c32360a38 (patch) | |
| tree | ed09a964ee9a382c0a1e108b0c418280054de14d /target/linux/x86/patches-3.2/900-8139cp_napi_gro_flush.patch | |
| parent | 9b433b090a57ca648ca0e3eeb3ddc68136a7ccc7 (diff) | |
8139cp: backport patches to make driver stable again
List of patches that Jo-Philipp groveled out of git.
Redux: defuzzed.
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30366 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86/patches-3.2/900-8139cp_napi_gro_flush.patch')
| -rw-r--r-- | target/linux/x86/patches-3.2/900-8139cp_napi_gro_flush.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/x86/patches-3.2/900-8139cp_napi_gro_flush.patch b/target/linux/x86/patches-3.2/900-8139cp_napi_gro_flush.patch new file mode 100644 index 000000000..532cb2ca0 --- /dev/null +++ b/target/linux/x86/patches-3.2/900-8139cp_napi_gro_flush.patch @@ -0,0 +1,25 @@ +From b189e810619a676e6b931a942a3e8387f3d39c21 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?fran=C3=A7ois=20romieu?= <romieu@fr.zoreil.com> +Date: Sun, 8 Jan 2012 13:41:33 +0000 +Subject: [PATCH] 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> +--- + drivers/net/ethernet/realtek/8139cp.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +--- 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); |