From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Gallatin Subject: [PATCH resend net-next 3/3] myri10ge: Use skb_fill_page_desc(). Date: Wed, 28 Nov 2012 16:21:03 -0500 Message-ID: <50B6803F.8020203@myri.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: netdev To: David Miller Return-path: 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) Sender: netdev-owner@vger.kernel.org List-ID: 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(-) 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 */ rx_frags[0].page_offset += MXGEFW_PAD; -- 1.7.9.5