From patchwork Thu Aug 25 08:28:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 111505 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 188D8B6F68 for ; Thu, 25 Aug 2011 18:28:40 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752410Ab1HYI2a (ORCPT ); Thu, 25 Aug 2011 04:28:30 -0400 Received: from smtp.citrix.com ([66.165.176.89]:37967 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752113Ab1HYI20 (ORCPT ); Thu, 25 Aug 2011 04:28:26 -0400 X-IronPort-AV: E=Sophos;i="4.68,280,1312171200"; d="scan'208";a="16458991" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 25 Aug 2011 04:28:25 -0400 Received: from smtp01.ad.xensource.com (10.219.128.104) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.137.0; Thu, 25 Aug 2011 04:28:25 -0400 Received: from cosworth.uk.xensource.com (cosworth.uk.xensource.com [10.80.16.52]) by smtp01.ad.xensource.com (8.13.1/8.13.1) with ESMTP id p7P8SFo2030615; Thu, 25 Aug 2011 01:28:23 -0700 From: Ian Campbell To: netdev@vger.kernel.org CC: Ian Campbell , Matt Carlson , Michael Chan , devicetree-discuss@lists.ozlabs.org Subject: [PATCH 5/9] tg3: convert to SKB paged frag API. Date: Thu, 25 Aug 2011 09:28:11 +0100 Message-ID: <1314260895-15936-5-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1314260881.10283.48.camel@zakaz.uk.xensource.com> References: <1314260881.10283.48.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Ian Campbell Reviewed-by: Konrad Rzeszutek Wilk Cc: Matt Carlson Cc: Michael Chan Cc: netdev@vger.kernel.org Cc: devicetree-discuss@lists.ozlabs.org --- drivers/net/ethernet/broadcom/tg3.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 0f81111..a7e28a2 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -6311,10 +6311,8 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; len = frag->size; - mapping = pci_map_page(tp->pdev, - frag->page, - frag->page_offset, - len, PCI_DMA_TODEVICE); + mapping = skb_frag_dma_map(&tp->pdev->dev, frag, 0, + len, PCI_DMA_TODEVICE); tnapi->tx_buffers[entry].skb = NULL; dma_unmap_addr_set(&tnapi->tx_buffers[entry], mapping,