diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2014-02-23 10:59:40 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2014-02-23 10:59:40 +0000 |
| commit | a73d292127dd4e60f2003c476b68a1782afaee4b (patch) | |
| tree | 6893168321baffe3f667d58069ad8717ff714e42 /target/linux/ixp4xx/patches-3.10/600-skb_avoid_dmabounce.patch | |
| parent | ad705417a3d3a154cb5c2605c98081ba0df83329 (diff) | |
| download | master-187ad058-a73d292127dd4e60f2003c476b68a1782afaee4b.tar.gz master-187ad058-a73d292127dd4e60f2003c476b68a1782afaee4b.tar.bz2 master-187ad058-a73d292127dd4e60f2003c476b68a1782afaee4b.zip | |
kernel: update 3.10 to 3.10.32
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39707 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-3.10/600-skb_avoid_dmabounce.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches-3.10/600-skb_avoid_dmabounce.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ixp4xx/patches-3.10/600-skb_avoid_dmabounce.patch b/target/linux/ixp4xx/patches-3.10/600-skb_avoid_dmabounce.patch index 2a11ba8d09..c46f516bd6 100644 --- a/target/linux/ixp4xx/patches-3.10/600-skb_avoid_dmabounce.patch +++ b/target/linux/ixp4xx/patches-3.10/600-skb_avoid_dmabounce.patch @@ -1,6 +1,6 @@ --- a/net/core/skbuff.c +++ b/net/core/skbuff.c -@@ -238,6 +238,9 @@ struct sk_buff *__alloc_skb(unsigned int +@@ -208,6 +208,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); -@@ -1082,6 +1085,10 @@ int pskb_expand_head(struct sk_buff *skb +@@ -1052,6 +1055,10 @@ int pskb_expand_head(struct sk_buff *skb if (skb_shared(skb)) BUG(); |