diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-10 15:47:10 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-10 15:47:10 -0800 |
| commit | d42f45cccebc3eaae18657a6cd0d17713d25372b (patch) | |
| tree | 66fe70f4f1265f3e376f7dc5a1d9e1a6d00e68aa /net/core/skbuff.c | |
| parent | aa5e93343ffb134b348624b74150b7c885c4e25a (diff) | |
| parent | aa065118fbebbd590438db10f3c349932a90cfda (diff) | |
Merge "net: support __netdev_alloc_frag to always use GFP_DMA"
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 6f7985e6f129..432de7089d0e 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -361,6 +361,9 @@ static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask) unsigned long flags; void *data; + if (IS_ENABLED(CONFIG_FORCE_ALLOC_FROM_DMA_ZONE)) + gfp_mask |= GFP_DMA; + local_irq_save(flags); nc = this_cpu_ptr(&netdev_alloc_cache); data = __alloc_page_frag(nc, fragsz, gfp_mask); |