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

[linux.git] / drivers / net / hyperv / netvsc_drv.c

diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index e8fce6d715ef069fe2e482b014b4d3f6e4f3e088..0a6cd2f1111fd40c6e79f394a12b5567f05da4b8 100644 (file)
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -435,7 +435,7 @@ static u32 init_page_array(void *hdr, u32 len, struct sk_buff *skb,
                skb_frag_t *frag = skb_shinfo(skb)->frags + i;
 
                slots_used += fill_pg_buf(skb_frag_page(frag),
-                                       frag->page_offset,
+                                       skb_frag_off(frag),
                                        skb_frag_size(frag), &pb[slots_used]);
        }
        return slots_used;
@@ -449,7 +449,7 @@ static int count_skb_frag_slots(struct sk_buff *skb)
        for (i = 0; i < frags; i++) {
                skb_frag_t *frag = skb_shinfo(skb)->frags + i;
                unsigned long size = skb_frag_size(frag);
-               unsigned long offset = frag->page_offset;
+               unsigned long offset = skb_frag_off(frag);
 
                /* Skip unused frames from start of page */
                offset &= ~PAGE_MASK;