From dfcf57a1c1707da2be5deeee931b42e6a886c1b1 Mon Sep 17 00:00:00 2001
From: Ian Campbell <Ian.Campbell@citrix.com>
Date: Wed, 31 Aug 2011 00:46:56 +0000
Subject: [PATCH] --- yaml --- r: 265711 b: refs/heads/master c:
 d1b08284ade773eb6aae680de03132eec618f2cd h: refs/heads/master i:   265709:
 48e6e2887025dc1357ca90dc1c0d024e06883ed5   265707:
 5201e3c33426d0171572d26e7d550cb4c5548328   265703:
 8d33b5b927e14c8db0288bc147301ce2829b0e4a   265695:
 ae49627391fd4835e6dd3a55b850c206a07407c9 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/macvtap.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 075b82c120f9..48c1ab406e4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 787343ad3d321fc987e36715433050df88353465
+refs/heads/master: d1b08284ade773eb6aae680de03132eec618f2cd
diff --git a/trunk/drivers/net/macvtap.c b/trunk/drivers/net/macvtap.c
index ab96c319a240..7c3f84acfdfb 100644
--- a/trunk/drivers/net/macvtap.c
+++ b/trunk/drivers/net/macvtap.c
@@ -503,10 +503,10 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
 		skb->truesize += len;
 		atomic_add(len, &skb->sk->sk_wmem_alloc);
 		while (len) {
-			f = &skb_shinfo(skb)->frags[i];
-			f->page = page[i];
-			f->page_offset = base & ~PAGE_MASK;
-			f->size = min_t(int, len, PAGE_SIZE - f->page_offset);
+			__skb_fill_page_desc(
+				skb, i, page[i],
+				base & ~PAGE_MASK,
+				min_t(int, len, PAGE_SIZE - f->page_offset));
 			skb_shinfo(skb)->nr_frags++;
 			/* increase sk_wmem_alloc */
 			base += f->size;