From fcbc97ad78f76de01964dd32dd4dcfa7f088d036 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Fri, 18 Mar 2016 23:41:21 +0000 Subject: kernel: update kernel 4.1 to version 4.1.20 Signed-off-by: Hauke Mehrtens SVN-Revision: 49035 --- target/linux/ixp4xx/patches-4.1/600-skb_avoid_dmabounce.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/ixp4xx') 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(); -- cgit v1.2.3