310b70f03e
Changelogs: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.12 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.13 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.14 Build tested on brcm63xx and ipq806x, runtested on brcm63xx. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 45711
24 lines
562 B
Diff
24 lines
562 B
Diff
--- a/net/core/skbuff.c
|
|
+++ b/net/core/skbuff.c
|
|
@@ -210,6 +210,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);
|
|
@@ -1096,6 +1099,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))
|