Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10398c06 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: support __netdev_alloc_frag to always use GFP_DMA" into msm-4.9

parents 8859999d dc8e3dea
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -370,6 +370,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);