From patchwork Wed Oct 5 10:28:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 117809 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 8551DB6F9B for ; Wed, 5 Oct 2011 21:29:13 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934362Ab1JEK3I (ORCPT ); Wed, 5 Oct 2011 06:29:08 -0400 Received: from smtp.citrix.com ([66.165.176.89]:27833 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934347Ab1JEK3G (ORCPT ); Wed, 5 Oct 2011 06:29:06 -0400 X-IronPort-AV: E=Sophos;i="4.68,490,1312171200"; d="scan'208";a="17956669" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 05 Oct 2011 06:29:00 -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; Wed, 5 Oct 2011 06:28:59 -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 p95ASrWK019255; Wed, 5 Oct 2011 03:28:57 -0700 From: Ian Campbell To: netdev@vger.kernel.org CC: Ian Campbell , Greg Kroah-Hartman , Mark Einon , devel@driverdev.osuosl.org Subject: [PATCH 4/8] et131x: convert to SKB paged frag API. Date: Wed, 5 Oct 2011 11:28:48 +0100 Message-ID: <1317810532-24984-4-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1317810511.21903.204.camel@zakaz.uk.xensource.com> References: <1317810511.21903.204.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 Cc: Greg Kroah-Hartman Cc: Mark Einon Cc: devel@driverdev.osuosl.org Cc: netdev@vger.kernel.org --- drivers/staging/et131x/et1310_tx.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/et131x/et1310_tx.c b/drivers/staging/et131x/et1310_tx.c index 8fb3051..03e7a4e 100644 --- a/drivers/staging/et131x/et1310_tx.c +++ b/drivers/staging/et131x/et1310_tx.c @@ -519,12 +519,12 @@ static int nic_send_packet(struct et131x_adapter *etdev, struct tcb *tcb) * returned by pci_map_page() is always 32-bit * addressable (as defined by the pci/dma subsystem) */ - desc[frag++].addr_lo = - pci_map_page(etdev->pdev, - frags[i - 1].page, - frags[i - 1].page_offset, - frags[i - 1].size, - PCI_DMA_TODEVICE); + desc[frag++].addr_lo = skb_frag_dma_map( + &etdev->pdev->dev, + &frags[i - 1], + 0, + frags[i - 1].size, + PCI_DMA_TODEVICE); } }