aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-3.14/600-skb_avoid_dmabounce.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-12-01 16:14:21 +0000
committerJohn Crispin <john@openwrt.org>2014-12-01 16:14:21 +0000
commitc27ee280ce3f7232059b06994e38a316f4eccebf (patch)
tree43afecfaf3feaf7325049834c77f8d3570fd5e07 /target/linux/ixp4xx/patches-3.14/600-skb_avoid_dmabounce.patch
parent00f5d358acac9841bc1e927a3fbaf9a743b1e585 (diff)
downloadupstream-c27ee280ce3f7232059b06994e38a316f4eccebf.tar.gz
upstream-c27ee280ce3f7232059b06994e38a316f4eccebf.tar.bz2
upstream-c27ee280ce3f7232059b06994e38a316f4eccebf.zip
ixp4xx: add 3.14 support
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 43464
Diffstat (limited to 'target/linux/ixp4xx/patches-3.14/600-skb_avoid_dmabounce.patch')
-rw-r--r--target/linux/ixp4xx/patches-3.14/600-skb_avoid_dmabounce.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/target/linux/ixp4xx/patches-3.14/600-skb_avoid_dmabounce.patch b/target/linux/ixp4xx/patches-3.14/600-skb_avoid_dmabounce.patch
new file mode 100644
index 0000000000..2e4c75ec52
--- /dev/null
+++ b/target/linux/ixp4xx/patches-3.14/600-skb_avoid_dmabounce.patch
@@ -0,0 +1,23 @@
+--- a/net/core/skbuff.c
++++ b/net/core/skbuff.c
+@@ -210,6 +210,9 @@ struct sk_buff *__alloc_skb(unsigned int
+
+ if (sk_memalloc_socks() && (flags & SKB_ALLOC_RX))
+ gfp_mask |= __GFP_MEMALLOC;
++#ifdef CONFIG_ARCH_IXP4XX
++ gfp_mask |= GFP_DMA;
++#endif
+
+ /* Get the HEAD */
+ skb = kmem_cache_alloc_node(cache, gfp_mask & ~__GFP_DMA, node);
+@@ -1057,6 +1060,10 @@ int pskb_expand_head(struct sk_buff *skb
+ if (skb_shared(skb))
+ BUG();
+
++#ifdef CONFIG_ARCH_IXP4XX
++ gfp_mask |= GFP_DMA;
++#endif
++
+ size = SKB_DATA_ALIGN(size);
+
+ if (skb_pfmemalloc(skb))