Merge "net: support __netdev_alloc_skb to always use GFP_DMA"

This commit is contained in:
Linux Build Service Account 2017-02-15 06:11:06 -08:00 committed by Gerrit - the friendly Code Review server
commit 942e3aaf81

View file

@ -422,6 +422,9 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int len,
len += NET_SKB_PAD;
if (IS_ENABLED(CONFIG_FORCE_ALLOC_FROM_DMA_ZONE))
gfp_mask |= GFP_DMA;
if ((len > SKB_WITH_OVERHEAD(PAGE_SIZE)) ||
(gfp_mask & (__GFP_DIRECT_RECLAIM | GFP_DMA))) {
skb = __alloc_skb(len, gfp_mask, SKB_ALLOC_RX, NUMA_NO_NODE);