From: Alexander Duyck Date: Wed, 13 May 2015 20:34:13 +0000 (-0700) Subject: net: Reserve skb headroom and set skb->dev even if using __alloc_skb X-Git-Tag: omap-for-v4.2/fixes-rc1^2~134^2~298 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a080e7bd0a8e56519d451eaea4ab05212d90e010;p=pandora-kernel.git net: Reserve skb headroom and set skb->dev even if using __alloc_skb When I had inlined __alloc_rx_skb into __netdev_alloc_skb and __napi_alloc_skb I had overlooked the fact that there was a return in the __alloc_rx_skb. As a result we weren't reserving headroom or setting the skb->dev in certain cases. This change corrects that by adding a couple of jump labels to jump to depending on __alloc_skb either succeeding or failing. Fixes: 9451980a6646 ("net: Use cached copy of pfmemalloc to avoid accessing page") Reported-by: Felipe Balbi Signed-off-by: Alexander Duyck Tested-by: Kevin Hilman Signed-off-by: David S. Miller --- Reading git-diff-tree failed