Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

[firefly-linux-kernel-4.4.55.git] / net / core / skbuff.c

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index bf9a5d93c2d10bbb9c0bfc82d5e7c5df82ef2b5c..dad4dd37e2aaad17b9493cb67796ed9650515a84 100644 (file)
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -340,7 +340,7 @@ struct sk_buff *build_skb(void *data, unsigned int frag_size)
 
        if (skb && frag_size) {
                skb->head_frag = 1;
-               if (virt_to_head_page(data)->pfmemalloc)
+               if (page_is_pfmemalloc(virt_to_head_page(data)))
                        skb->pfmemalloc = 1;
        }
        return skb;
@@ -392,7 +392,7 @@ EXPORT_SYMBOL(napi_alloc_frag);
 /**
  *     __netdev_alloc_skb - allocate an skbuff for rx on a specific device
  *     @dev: network device to receive on
- *     @length: length to allocate
+ *     @len: length to allocate
  *     @gfp_mask: get_free_pages mask, passed to alloc_skb
  *
  *     Allocate a new &sk_buff and assign it a usage count of one. The
@@ -461,7 +461,7 @@ EXPORT_SYMBOL(__netdev_alloc_skb);
 /**
  *     __napi_alloc_skb - allocate skbuff for rx in a specific NAPI instance
  *     @napi: napi instance this buffer was allocated for
- *     @length: length to allocate
+ *     @len: length to allocate
  *     @gfp_mask: get_free_pages mask, passed to alloc_skb and alloc_pages
  *
  *     Allocate a new sk_buff for use in NAPI receive.  This buffer will