From patchwork Thu Oct 20 08:17:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krishna Kumar X-Patchwork-Id: 120758 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D8F53B70D6 for ; Thu, 20 Oct 2011 19:17:57 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755969Ab1JTIRg (ORCPT ); Thu, 20 Oct 2011 04:17:36 -0400 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:44909 "EHLO e23smtp09.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755711Ab1JTIRf (ORCPT ); Thu, 20 Oct 2011 04:17:35 -0400 Received: from /spool/local by e23smtp09.au.ibm.com with XMail ESMTP for from ; Thu, 20 Oct 2011 09:12:45 +1000 Received: from d23relay04.au.ibm.com ([202.81.31.246]) by e23smtp09.au.ibm.com ([202.81.31.206]) with XMail ESMTP; Thu, 20 Oct 2011 09:12:43 +1000 Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p9K8EwLR1990816; Thu, 20 Oct 2011 19:14:58 +1100 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p9K8HTwZ026152; Thu, 20 Oct 2011 19:17:30 +1100 Received: from krkumar2.in.ibm.com ([9.77.213.89]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p9K8HRxr026110; Thu, 20 Oct 2011 19:17:28 +1100 From: Krishna Kumar To: rusty@rustcorp.com.au, mst@redhat.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, davem@davemloft.net, Krishna Kumar , virtualization@lists.linux-foundation.org Date: Thu, 20 Oct 2011 13:47:27 +0530 Message-Id: <20111020081727.509.83122.sendpatchset@krkumar2.in.ibm.com> Subject: [PATCH] virtio_net: Clean up set_skb_frag() x-cbid: 11101923-3568-0000-0000-0000008DDA47 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- drivers/net/virtio_net.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff -ruNp org/drivers/net/virtio_net.c new/drivers/net/virtio_net.c --- org/drivers/net/virtio_net.c 2011-10-20 08:34:31.000000000 +0530 +++ new/drivers/net/virtio_net.c 2011-10-20 08:43:57.000000000 +0530 @@ -143,18 +143,15 @@ static void skb_xmit_done(struct virtque 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,