---

yaml
---
r: 266095
b: refs/heads/master
c: 653fc91
h: refs/heads/master
i:
  266093: 90d00b3
  266091: 3fa78df
  266087: fffc187
  266079: b712b77
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59da45c4fe612cb4312bdf8e4f85fc295c73d50b
+refs/heads/master: 653fc9155769f8af8ea73e7e9c99dcaa5bd62086

trunk/drivers/net/macvtap.c

@@ -453,7 +453,6 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
 	int copy = skb_headlen(skb);
 	int size, offset1 = 0;
 	int i = 0;
-	skb_frag_t *f;
 
 	/* Skip over from offset */
 	while (count && (offset >= from->iov_len)) {
@@ -503,14 +502,13 @@ 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) {
-			__skb_fill_page_desc(
-				skb, i, page[i],
-				base & ~PAGE_MASK,
-				min_t(int, len, PAGE_SIZE - f->page_offset));
+			int off = base & ~PAGE_MASK;
+			int size = min_t(int, len, PAGE_SIZE - off);
+			__skb_fill_page_desc(skb, i, page[i], off, size);
 			skb_shinfo(skb)->nr_frags++;
 			/* increase sk_wmem_alloc */
-			base += f->size;
-			len -= f->size;
+			base += size;
+			len -= size;
 			i++;
 		}
 		offset1 = 0;