Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux.git] / drivers / net / xen-netback / netback.c

diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index c9262ffeefe4cb3eb8a13dfdcc0b77801adc5876..0020b2e8c279d40059f470a68fb2f0d8d1599cfb 100644 (file)
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -136,12 +136,12 @@ static inline struct xenvif_queue *ubuf_to_queue(const struct ubuf_info *ubuf)
 
 static u16 frag_get_pending_idx(skb_frag_t *frag)
 {
-       return (u16)frag->page_offset;
+       return (u16)skb_frag_off(frag);
 }
 
 static void frag_set_pending_idx(skb_frag_t *frag, u16 pending_idx)
 {
-       frag->page_offset = pending_idx;
+       skb_frag_off_set(frag, pending_idx);
 }
 
 static inline pending_ring_idx_t pending_index(unsigned i)
@@ -1057,7 +1057,7 @@ static int xenvif_handle_frag_list(struct xenvif_queue *queue, struct sk_buff *s
                        int j;
                        skb->truesize += skb->data_len;
                        for (j = 0; j < i; j++)
-                               put_page(frags[j].page.p);
+                               put_page(skb_frag_page(&frags[j]));
                        return -ENOMEM;
                }
 
@@ -1069,8 +1069,8 @@ static int xenvif_handle_frag_list(struct xenvif_queue *queue, struct sk_buff *s
                        BUG();
 
                offset += len;
-               frags[i].page.p = page;
-               frags[i].page_offset = 0;
+               __skb_frag_set_page(&frags[i], page);
+               skb_frag_off_set(&frags[i], 0);
                skb_frag_size_set(&frags[i], len);
        }
 
@@ -1655,9 +1655,6 @@ static int __init netback_init(void)
 
 #ifdef CONFIG_DEBUG_FS
        xen_netback_dbg_root = debugfs_create_dir("xen-netback", NULL);
-       if (IS_ERR_OR_NULL(xen_netback_dbg_root))
-               pr_warn("Init of debugfs returned %ld!\n",
-                       PTR_ERR(xen_netback_dbg_root));
 #endif /* CONFIG_DEBUG_FS */
 
        return 0;