diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-03-18 23:41:21 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2016-03-18 23:41:21 +0000 |
commit | fcbc97ad78f76de01964dd32dd4dcfa7f088d036 (patch) | |
tree | 529c90e30f06974d5671c6ac33c8a5238ce4e581 /target/linux/ixp4xx | |
parent | 6d933987db7be48d8b1637b32026ba0e6d8f27fa (diff) | |
download | upstream-fcbc97ad78f76de01964dd32dd4dcfa7f088d036.tar.gz upstream-fcbc97ad78f76de01964dd32dd4dcfa7f088d036.tar.bz2 upstream-fcbc97ad78f76de01964dd32dd4dcfa7f088d036.zip |
kernel: update kernel 4.1 to version 4.1.20
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 49035
Diffstat (limited to 'target/linux/ixp4xx')
-rw-r--r-- | target/linux/ixp4xx/patches-4.1/600-skb_avoid_dmabounce.patch | 4 |
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(); |