From 8a59a7b94fc56e3ed3054c3c655b646bb631f9bc Mon Sep 17 00:00:00 2001 From: Krishna Kumar Date: Wed, 19 Oct 2011 22:17:27 +0000 Subject: [PATCH] virtio_net: Clean up set_skb_frag() Remove manual initialization in set_skb_frag, and instead use __skb_fill_page_desc() to do the same. Patch tested on net-next. Signed-off-by: Krishna Kumar Acked-by: Eric Dumazet Signed-off-by: David S. Miller --- drivers/net/virtio_net.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 0d4841b..abbf34f 100644 --- a/drivers/net/virtio_net.c +++ b/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, -- 2.7.4