diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-02-07 21:56:51 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-02-07 21:56:51 +0000 |
| commit | f35c4a3266bf655a177356e3e9b3a6df1d8e842e (patch) | |
| tree | b23d4e6b834b1ef59c6086074dc9e5cd183d0cc6 /target/linux/x86/patches-3.2/900-8139cp_napi_gro_flush.patch | |
| parent | 5609ad736e4cbaf3cc44bf47964690ac204a3f3a (diff) | |
| download | master-31e0f0ae-f35c4a3266bf655a177356e3e9b3a6df1d8e842e.tar.gz master-31e0f0ae-f35c4a3266bf655a177356e3e9b3a6df1d8e842e.tar.bz2 master-31e0f0ae-f35c4a3266bf655a177356e3e9b3a6df1d8e842e.zip | |
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>
SVN-Revision: 30366
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 0000000000..532cb2ca0d --- /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); |