aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2016-03-18 23:41:21 +0000
committerHauke Mehrtens <hauke@openwrt.org>2016-03-18 23:41:21 +0000
commitb3191abc3fe7b95cf46da8dc56603a3a04c7c461 (patch)
treeb1f3b12ce0f6f0137a6fe047ecf67f9c51547516 /target/linux/ixp4xx
parent3c2adfb7634f84cdc9b92f146b7fbbf46a709cd3 (diff)
downloadmaster-187ad058-b3191abc3fe7b95cf46da8dc56603a3a04c7c461.tar.gz
master-187ad058-b3191abc3fe7b95cf46da8dc56603a3a04c7c461.tar.bz2
master-187ad058-b3191abc3fe7b95cf46da8dc56603a3a04c7c461.zip
kernel: update kernel 4.1 to version 4.1.20
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49035 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx')
-rw-r--r--target/linux/ixp4xx/patches-4.1/600-skb_avoid_dmabounce.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ixp4xx/patches-4.1/600-skb_avoid_dmabounce.patch b/target/linux/ixp4xx/patches-4.1/600-skb_avoid_dmabounce.patch
index 5d6809d5e4..271f6c9945 100644
--- a/target/linux/ixp4xx/patches-4.1/600-skb_avoid_dmabounce.patch
+++ b/target/linux/ixp4xx/patches-4.1/600-skb_avoid_dmabounce.patch
@@ -1,6 +1,6 @@
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
-@@ -212,6 +212,9 @@ struct sk_buff *__alloc_skb(unsigned int
+@@ -214,6 +214,9 @@ struct sk_buff *__alloc_skb(unsigned int
if (sk_memalloc_socks() && (flags & SKB_ALLOC_RX))
gfp_mask |= __GFP_MEMALLOC;
@@ -10,7 +10,7 @@
/* Get the HEAD */
skb = kmem_cache_alloc_node(cache, gfp_mask & ~__GFP_DMA, node);
-@@ -1192,6 +1195,10 @@ int pskb_expand_head(struct sk_buff *skb
+@@ -1194,6 +1197,10 @@ int pskb_expand_head(struct sk_buff *skb
if (skb_shared(skb))
BUG();