From: Alexandros C. Couloumbis <alex@ozo.com>
Date: Fri, 18 Jun 2010 11:09:10 +0000 (+0000)
Subject: ixp4xx: port 600-skb_avoid_dmabounce.patch to 2.6.33 & 2.6.35
X-Git-Tag: v19.07.0-rc1~30256
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b54213c5800e337d2b1f1597e31bb1a1dc0edb63;p=openwrt%2Fstaging%2Fhauke.git

ixp4xx: port 600-skb_avoid_dmabounce.patch to 2.6.33 & 2.6.35

SVN-Revision: 21835
---

diff --git a/target/linux/ixp4xx/patches-2.6.33/600-skb_avoid_dmabounce.patch b/target/linux/ixp4xx/patches-2.6.33/600-skb_avoid_dmabounce.patch
new file mode 100644
index 0000000000..026c717c78
--- /dev/null
+++ b/target/linux/ixp4xx/patches-2.6.33/600-skb_avoid_dmabounce.patch
@@ -0,0 +1,13 @@
+--- a/net/core/skbuff.c
++++ b/net/core/skbuff.c
+@@ -264,6 +264,10 @@ struct sk_buff *__alloc_skb(unsigned int
+ 	if (!skb)
+ 		goto out;
+ 
++#ifdef CONFIG_ARCH_IXP4XX 
++	gfp_mask |= GFP_DMA;
++#endif
++
+ 	size = SKB_DATA_ALIGN(size);
+ 	data = kmalloc_node_track_caller(size + sizeof(struct skb_shared_info),
+ 			gfp_mask, node);
diff --git a/target/linux/ixp4xx/patches-2.6.35/600-skb_avoid_dmabounce.patch b/target/linux/ixp4xx/patches-2.6.35/600-skb_avoid_dmabounce.patch
new file mode 100644
index 0000000000..5b0e3fdb85
--- /dev/null
+++ b/target/linux/ixp4xx/patches-2.6.35/600-skb_avoid_dmabounce.patch
@@ -0,0 +1,13 @@
+--- a/net/core/skbuff.c
++++ b/net/core/skbuff.c
+@@ -183,6 +183,10 @@ struct sk_buff *__alloc_skb(unsigned int
+ 		goto out;
+ 	prefetchw(skb);
+ 
++#ifdef CONFIG_ARCH_IXP4XX 
++	gfp_mask |= GFP_DMA;
++#endif
++
+ 	size = SKB_DATA_ALIGN(size);
+ 	data = kmalloc_node_track_caller(size + sizeof(struct skb_shared_info),
+ 			gfp_mask, node);