aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-06-18 11:09:10 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-06-18 11:09:10 +0000
commit31035755e1ddf79a54952a22dd51d7b05abecc50 (patch)
treeae7a4f0d311ef441b94b38d3de46d5bf65539002 /target/linux/ixp4xx
parent6188d187c8618bd84a26e847349c3ec6e4a6d949 (diff)
downloadupstream-31035755e1ddf79a54952a22dd51d7b05abecc50.tar.gz
upstream-31035755e1ddf79a54952a22dd51d7b05abecc50.tar.bz2
upstream-31035755e1ddf79a54952a22dd51d7b05abecc50.zip
ixp4xx: port 600-skb_avoid_dmabounce.patch to 2.6.33 & 2.6.35
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21835 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx')
-rw-r--r--target/linux/ixp4xx/patches-2.6.33/600-skb_avoid_dmabounce.patch13
-rw-r--r--target/linux/ixp4xx/patches-2.6.35/600-skb_avoid_dmabounce.patch13
2 files changed, 26 insertions, 0 deletions
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);