summaryrefslogtreecommitdiff
path: root/target/linux/ixp4xx
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-05-07 20:11:43 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-05-07 20:11:43 +0000
commitfe2be6a9a3230f4920dae5e6925554204790898a (patch)
treeb9b93b23c7fdbd4392b5c32e8cef559fdaee340d /target/linux/ixp4xx
parent6365d3e54495029553b321af73f618db093decf7 (diff)
kernel: update linux 3.3 to 3.3.5
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31645 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx')
-rw-r--r--target/linux/ixp4xx/patches-3.3/600-skb_avoid_dmabounce.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ixp4xx/patches-3.3/600-skb_avoid_dmabounce.patch b/target/linux/ixp4xx/patches-3.3/600-skb_avoid_dmabounce.patch
index f48c273b4a..625b76897a 100644
--- a/target/linux/ixp4xx/patches-3.3/600-skb_avoid_dmabounce.patch
+++ b/target/linux/ixp4xx/patches-3.3/600-skb_avoid_dmabounce.patch
@@ -1,6 +1,6 @@
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
-@@ -176,6 +176,10 @@ struct sk_buff *__alloc_skb(unsigned int
+@@ -177,6 +177,10 @@ struct sk_buff *__alloc_skb(unsigned int
struct sk_buff *skb;
u8 *data;
@@ -11,7 +11,7 @@
cache = fclone ? skbuff_fclone_cache : skbuff_head_cache;
/* Get the HEAD */
-@@ -929,6 +933,10 @@ int pskb_expand_head(struct sk_buff *skb
+@@ -946,6 +950,10 @@ int pskb_expand_head(struct sk_buff *skb
if (skb_shared(skb))
BUG();