From patchwork Wed Nov 14 13:06:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Gallatin X-Patchwork-Id: 198900 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 C918E2C0091 for ; Thu, 15 Nov 2012 00:06:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422831Ab2KNNGq (ORCPT ); Wed, 14 Nov 2012 08:06:46 -0500 Received: from mail-gg0-f174.google.com ([209.85.161.174]:37840 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422804Ab2KNNGp (ORCPT ); Wed, 14 Nov 2012 08:06:45 -0500 Received: by mail-gg0-f174.google.com with SMTP id k2so45932ggd.19 for ; Wed, 14 Nov 2012 05:06:44 -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:subject :content-type:content-transfer-encoding:x-gm-message-state; bh=AFtfDCwIou35IcP69WZYEeGjEusF5o4/tUUgfrp7t+Q=; b=WzlurlkfHGjEhQKAWmtPqdID0Q7GD6Bz8FmX7pthLbDpIXR4iwtYdANlLis0PK7tBD KPwaBZ8oR9dF4EdVUox/Nv3wW0RRDDIJwDAV8wZVMVLr5wCmTRXpX2XpExtkPhlLq/CS GYBt6cdqsMJ17egM6v3wpuijVEzqIG6Jp82NcY3KsOrzc+yb13ciPL8YtIr3dBKQyz6j g+hhCMCDTAtOjsjfb5deGC7Jwa9QwOz4puM/Lquo1/FQ9/VpydIWTzNPRHWe8zsciCFo Z4x/Aric2dUtlykF/0Qtqd1Rcx9l68UmG5MIPjysIotvE/0n75ZqeckKT/rOnQNnGUVR LWNw== Received: by 10.236.150.130 with SMTP id z2mr25717122yhj.115.1352898404824; Wed, 14 Nov 2012 05:06:44 -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 z6sm12700678yhl.8.2012.11.14.05.06.43 (version=SSLv3 cipher=OTHER); Wed, 14 Nov 2012 05:06:44 -0800 (PST) Message-ID: <50A39762.1070707@myri.com> Date: Wed, 14 Nov 2012 08:06:42 -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: netdev Subject: [PATCH net-next 3/3] myri10ge: Use skb_fill_page_desc(). X-Gm-Message-State: ALoCoQlwSLDRuvFXLdnuPQNzt0axWqEkXqvOYDNtIrNibIQ68L/LIqzgmpKggVKxHSGM2vwqUasG 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 b9b6dfd..82e9dcc 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c @@ -1347,17 +1347,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 */