Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[karo-tx-linux.git] / net / core / skbuff.c

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 724bb7cb173fe5f966a7b7bd56cff70b8bdf9ba7..20e02d2605ecb2f10f5f74ab6f00cbd8fb852615 100644 (file)
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -824,7 +824,7 @@ int skb_copy_ubufs(struct sk_buff *skb, gfp_t gfp_mask)
                page = alloc_page(gfp_mask);
                if (!page) {
                        while (head) {
-                               struct page *next = (struct page *)head->private;
+                               struct page *next = (struct page *)page_private(head);
                                put_page(head);
                                head = next;
                        }
@@ -834,7 +834,7 @@ int skb_copy_ubufs(struct sk_buff *skb, gfp_t gfp_mask)
                memcpy(page_address(page),
                       vaddr + f->page_offset, skb_frag_size(f));
                kunmap_atomic(vaddr);
-               page->private = (unsigned long)head;
+               set_page_private(page, (unsigned long)head);
                head = page;
        }
 
@@ -848,7 +848,7 @@ int skb_copy_ubufs(struct sk_buff *skb, gfp_t gfp_mask)
        for (i = num_frags - 1; i >= 0; i--) {
                __skb_fill_page_desc(skb, i, head, 0,
                                     skb_shinfo(skb)->frags[i].size);
-               head = (struct page *)head->private;
+               head = (struct page *)page_private(head);
        }
 
        skb_shinfo(skb)->tx_flags &= ~SKBTX_DEV_ZEROCOPY;