diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-12-11 20:07:39 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-12-11 20:07:39 +0000 |
commit | 3cc3c0a518292c6e500c08f17be000ece9675c28 (patch) | |
tree | c250a3ba9356d1585b0efb9b860b82198ec3071c /target/linux/octeon/patches-3.10/0006-MIPS-Octeon-ethernet-remove-debug-noise.patch | |
parent | c095c7c2027b5f2896926f288bd1172a7a2fbc4f (diff) | |
download | upstream-3cc3c0a518292c6e500c08f17be000ece9675c28.tar.gz upstream-3cc3c0a518292c6e500c08f17be000ece9675c28.tar.bz2 upstream-3cc3c0a518292c6e500c08f17be000ece9675c28.zip |
octeon: remove linux 3.10 support
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 43635
Diffstat (limited to 'target/linux/octeon/patches-3.10/0006-MIPS-Octeon-ethernet-remove-debug-noise.patch')
-rw-r--r-- | target/linux/octeon/patches-3.10/0006-MIPS-Octeon-ethernet-remove-debug-noise.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/target/linux/octeon/patches-3.10/0006-MIPS-Octeon-ethernet-remove-debug-noise.patch b/target/linux/octeon/patches-3.10/0006-MIPS-Octeon-ethernet-remove-debug-noise.patch deleted file mode 100644 index cc4f270e79..0000000000 --- a/target/linux/octeon/patches-3.10/0006-MIPS-Octeon-ethernet-remove-debug-noise.patch +++ /dev/null @@ -1,60 +0,0 @@ -From patchwork Thu Sep 5 18:44:00 2013 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [2/3] staging: octeon-ethernet: remove skb alloc failure warnings -From: Aaro Koskinen <aaro.koskinen@iki.fi> -X-Patchwork-Id: 5811 -Message-Id: <1378406641-16530-3-git-send-email-aaro.koskinen@iki.fi> -To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, - devel@driverdev.osuosl.org, linux-mips@linux-mips.org -Cc: David Daney <david.daney@cavium.com>, - "Jason A. Donenfeld" <Jason@zx2c4.com>, richard@nod.at, - Aaro Koskinen <aaro.koskinen@iki.fi> -Date: Thu, 5 Sep 2013 21:44:00 +0300 - -Remove skb allocation failure warnings. They will trigger a page -allocation warning already. Also, one of the warnings was not ratelimited, -causing the box to lock up under heavy traffic & low memory. - -Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> -Acked-by: David Daney <david.daney@cavium.com> - ---- -drivers/staging/octeon/ethernet-mem.c | 7 +------ - drivers/staging/octeon/ethernet-rx.c | 3 --- - 2 files changed, 1 insertion(+), 9 deletions(-) - -diff --git a/drivers/staging/octeon/ethernet-mem.c b/drivers/staging/octeon/ethernet-mem.c -index 78b6cb7..199059d 100644 ---- a/drivers/staging/octeon/ethernet-mem.c -+++ b/drivers/staging/octeon/ethernet-mem.c -@@ -48,13 +48,8 @@ static int cvm_oct_fill_hw_skbuff(int pool, int size, int elements) - while (freed) { - - struct sk_buff *skb = dev_alloc_skb(size + 256); -- if (unlikely(skb == NULL)) { -- pr_warning -- ("Failed to allocate skb for hardware pool %d\n", -- pool); -+ if (unlikely(skb == NULL)) - break; -- } -- - skb_reserve(skb, 256 - (((unsigned long)skb->data) & 0x7f)); - *(struct sk_buff **)(skb->data - sizeof(void *)) = skb; - cvmx_fpa_free(skb->data, pool, DONT_WRITEBACK(size / 128)); -diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c -index 10e5416..e14a1bb 100644 ---- a/drivers/staging/octeon/ethernet-rx.c -+++ b/drivers/staging/octeon/ethernet-rx.c -@@ -337,9 +337,6 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget) - */ - skb = dev_alloc_skb(work->len); - if (!skb) { -- printk_ratelimited("Port %d failed to allocate " -- "skbuff, packet dropped\n", -- work->ipprt); - cvm_oct_free_work(work); - continue; - } |