openwrt/target/linux/ixp4xx/patches-3.10/600-skb_avoid_dmabounce.patch
Gabor Juhos 0e2586a774 kernel: update 3.10 to 3.10.26
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 39220
2014-01-11 16:06:37 +00:00

24 lines
562 B
Diff

--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -238,6 +238,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);
@@ -1082,6 +1085,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))