From patchwork Wed Nov 28 21:21:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Gallatin X-Patchwork-Id: 202550 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 3130F2C008C for ; Thu, 29 Nov 2012 08:21:23 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932432Ab2K1VVK (ORCPT ); Wed, 28 Nov 2012 16:21:10 -0500 Received: from mail-qc0-f174.google.com ([209.85.216.174]:36839 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932347Ab2K1VVG (ORCPT ); Wed, 28 Nov 2012 16:21:06 -0500 Received: by mail-qc0-f174.google.com with SMTP id o22so10089890qcr.19 for ; Wed, 28 Nov 2012 13:21:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding:x-gm-message-state; bh=TrF218oeoUccEtyO+YUoQhgvFxCaYmF/HLxtgkbhBX0=; b=JABRTfXYm/1gFpgwHAD3YtjYQiD53S/jlzgrdwgnHdQv5ot/nBlBospn4pKMdjjz1N X3nZxezdorXeuuc4lMNUw005SPBafE5NYtgdCW08AcRMm5LD3JDTI+Qa2Sketv24pF8Z F/+iuN3ZdrZk5aYUZ4JU8Tgv65QEWzOnRCoNdSKiSCxRHuV2rSCH9WnIZxvOhtsn5nxb 4UgES6kgmoeiSwVZ6BhbAr/yEAkfmt7OuOSX53PN8CDYBiAZWREYIlsrhkXdmywnwMWq mo3wlH86nw5CuiIhGc3qvfBUdy1Iop6pjFAlh2dO/pee3r6Y6UxCQocYGyVPsjIGFurw xWHQ== Received: by 10.224.179.211 with SMTP id br19mr22415884qab.43.1354137666145; Wed, 28 Nov 2012 13:21:06 -0800 (PST) Received: from [192.168.200.2] (c-24-125-204-77.hsd1.va.comcast.net. [24.125.204.77]) by mx.google.com with ESMTPS id 20sm11642561qek.6.2012.11.28.13.21.04 (version=SSLv3 cipher=OTHER); Wed, 28 Nov 2012 13:21:05 -0800 (PST) Message-ID: <50B6803F.8020203@myri.com> Date: Wed, 28 Nov 2012 16:21:03 -0500 From: Andrew Gallatin User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: David Miller CC: netdev Subject: [PATCH resend net-next 3/3] myri10ge: Use skb_fill_page_desc(). X-Gm-Message-State: ALoCoQkjnNkL+r9vfTmU2vLR9MrHTUGZSzjIe9a+lLa1xWvK/CJ4GYgryEZRp53Mhoh7LalXZSv/ Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Now that LRO is gone, the receive routine is much simpler, and we are able to use the standard skb_fill_page_desc() in myri10ge. Signed-off-by: Andrew Gallatin --- drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) rx_frags[0].page_offset += MXGEFW_PAD; diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c index 93ed089..6bf1d26 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c @@ -1340,17 +1340,14 @@ myri10ge_rx_done(struct myri10ge_slice_state *ss, int len, __wsum csum) /* Fill skb_frag_struct(s) with data from our receive */ for (i = 0, remainder = len; remainder > 0; i++) { myri10ge_unmap_rx_page(pdev, &rx->info[idx], bytes); - __skb_frag_set_page(&rx_frags[i], rx->info[idx].page); - rx_frags[i].page_offset = rx->info[idx].page_offset; - if (remainder < MYRI10GE_ALLOC_SIZE) - skb_frag_size_set(&rx_frags[i], remainder); - else - skb_frag_size_set(&rx_frags[i], MYRI10GE_ALLOC_SIZE); + skb_fill_page_desc(skb, i, rx->info[idx].page, + rx->info[idx].page_offset, + remainder < MYRI10GE_ALLOC_SIZE ? + remainder : MYRI10GE_ALLOC_SIZE); rx->cnt++; idx = rx->cnt & rx->mask; remainder -= MYRI10GE_ALLOC_SIZE; } - skb_shinfo(skb)->nr_frags = i; /* remove padding */