From fcf190f0e654340edde49070ecf252e00bc005af Mon Sep 17 00:00:00 2001 From: Krishna Kumar Date: Wed, 19 Oct 2011 22:17:27 +0000 Subject: [PATCH] --- yaml --- r: 266887 b: refs/heads/master c: 8a59a7b94fc56e3ed3054c3c655b646bb631f9bc h: refs/heads/master i: 266885: 041c4130c1bfa08546ef0e95c6d90d15ece05b4c 266883: f8db7947f6aea093607a7289acae90238937d51b 266879: da3d851abd58d6b08a8fa6b5f8e648feebcb42ca v: v3 --- [refs] | 2 +- trunk/drivers/net/virtio_net.c | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 4c514c8ec675..765f2d1058f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0bec1cd8f7ac966f2885f7e56ec44df87bab738 +refs/heads/master: 8a59a7b94fc56e3ed3054c3c655b646bb631f9bc diff --git a/trunk/drivers/net/virtio_net.c b/trunk/drivers/net/virtio_net.c index 0d4841bed0f9..abbf34fcf4cd 100644 --- a/trunk/drivers/net/virtio_net.c +++ b/trunk/drivers/net/virtio_net.c @@ -143,18 +143,15 @@ static void skb_xmit_done(struct virtqueue *svq) static void set_skb_frag(struct sk_buff *skb, struct page *page, unsigned int offset, unsigned int *len) { + int size = min((unsigned)PAGE_SIZE - offset, *len); int i = skb_shinfo(skb)->nr_frags; - skb_frag_t *f; - f = &skb_shinfo(skb)->frags[i]; - skb_frag_size_set(f, min((unsigned)PAGE_SIZE - offset, *len)); - f->page_offset = offset; - __skb_frag_set_page(f, page); + __skb_fill_page_desc(skb, i, page, offset, size); - skb->data_len += skb_frag_size(f); - skb->len += skb_frag_size(f); + skb->data_len += size; + skb->len += size; skb_shinfo(skb)->nr_frags++; - *len -= skb_frag_size(f); + *len -= size; } static struct sk_buff *page_to_skb(struct virtnet_info *vi,