From: David S. Miller Date: Wed, 12 Nov 2014 05:00:20 +0000 (-0500) Subject: Merge branch 'skb_alloc_pages' X-Git-Tag: v3.19-rc1~118^2~216 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=ee47ad42c5868ffad569a94dd680f7ae79de2fb9 Merge branch 'skb_alloc_pages' Alexander Duyck says: ==================== Replace __skb_alloc_pages with simpler function This patch series replaces __skb_alloc_pages with a much simpler function, __dev_alloc_pages. The main difference between the two is that __skb_alloc_pages had an sk_buff pointer that was being passed as NULL in call places where it was called. In a couple of cases the NULL was passed by variable and this led to unnecessary code being run. As such in order to simplify things the __dev_alloc_pages call only takes a mask and the page order being requested. In addition it takes advantage of several behaviors already built into the page allocator so that it can just set GFP flags unconditionally. v2: Renamed functions to dev_alloc_page(s) instead of netdev_alloc_page(s) Removed __GFP_COLD flag from usb code as it was redundant v3: Update patch descriptions and subjects to match changes in v2 ==================== Signed-off-by: David S. Miller --- ee47ad42c5868ffad569a94dd680f7ae79de2fb9