Merge "msm: net: add the fix for the skb data alloc fail case" (896783c5) · Commits · e / devices / android_kernel_sony_msm8994

net/core/skbuff.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -252,7 +252,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
		size = SKB_DATA_ALIGN(size);
		size += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
		data = kmalloc_reserve(size, gfp_mask, node, &pfmemalloc);
		if (!data)
		if (unlikely(ZERO_OR_NULL_PTR(data)))
		goto nodata;
		/* kmalloc(size) might give us more room than requested.
		* Put skb_shared_info exactly at the end of allocated zone,