---

yaml --- r: 265711 b: refs/heads/master c: d1b0828 h: refs/heads/master i: 265709: 48e6e28 265707: 5201e3c 265703: 8d33b5b 265695: ae49627 v: v3
git-mirror · Sep 15, 2011 · dfcf57a · dfcf57a
1 parent d5b5673
commit dfcf57a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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;