diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2012-04-09 14:48:51 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2012-04-09 14:48:51 +0000 |
| commit | 16b4cbcdd64d92f6e79d41e11eda25a178ef3b53 (patch) | |
| tree | bd75cb94a45491fc7adfc7874a0f794afe565cbc /target/linux/x86 | |
| parent | 1a57b05f472e60b05a8a4360718253820e8fece4 (diff) | |
| download | upstream-16b4cbcdd64d92f6e79d41e11eda25a178ef3b53.tar.gz upstream-16b4cbcdd64d92f6e79d41e11eda25a178ef3b53.tar.bz2 upstream-16b4cbcdd64d92f6e79d41e11eda25a178ef3b53.zip | |
kernel: update linux 3.2 to 3.2.14
SVN-Revision: 31222
Diffstat (limited to 'target/linux/x86')
| -rw-r--r-- | target/linux/x86/patches-3.2/900-8139cp_napi_gro_flush.patch | 25 |
1 files changed, 0 insertions, 25 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 deleted file mode 100644 index 532cb2ca0d..0000000000 --- a/target/linux/x86/patches-3.2/900-8139cp_napi_gro_flush.patch +++ /dev/null @@ -1,25 +0,0 @@ -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); |