Skip to content

Commit

Permalink
virtio_net: Clean up set_skb_frag()
Browse files Browse the repository at this point in the history
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 <krkumar2@in.ibm.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Krishna Kumar authored and David S. Miller committed Oct 20, 2011
1 parent a0bec1c commit 8a59a7b
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions drivers/net/virtio_net.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 8a59a7b

Please sign in to comment.