All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ian Campbell <ian.campbell@citrix.com>
To: netdev@vger.kernel.org
Cc: Ian Campbell <ian.campbell@citrix.com>,
	Jay Cliburn <jcliburn@gmail.com>,
	Chris Snook <chris.snook@gmail.com>,
	Jie Yang <jie.yang@atheros.com>
Subject: [PATCH 05/14] atl1e: convert to SKB paged frag API.
Date: Tue, 30 Aug 2011 10:18:21 +0100	[thread overview]
Message-ID: <1314695910-22344-5-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1314695847.10283.102.camel@zakaz.uk.xensource.com>

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Jay Cliburn <jcliburn@gmail.com>
Cc: Chris Snook <chris.snook@gmail.com>
Cc: Jie Yang <jie.yang@atheros.com>
Cc: netdev@vger.kernel.org
---
 drivers/net/ethernet/atheros/atl1e/atl1e_main.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
index 1b5dc79..7e27eb3 100644
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
@@ -1765,12 +1765,11 @@ static void atl1e_tx_map(struct atl1e_adapter *adapter,
 				MAX_TX_BUF_LEN : buf_len;
 			buf_len -= tx_buffer->length;
 
-			tx_buffer->dma =
-				pci_map_page(adapter->pdev, frag->page,
-						frag->page_offset +
-						(i * MAX_TX_BUF_LEN),
-						tx_buffer->length,
-						PCI_DMA_TODEVICE);
+			tx_buffer->dma = skb_frag_dma_map(&adapter->pdev->dev,
+							  frag,
+							  (i * MAX_TX_BUF_LEN),
+							  tx_buffer->length,
+							  PCI_DMA_TODEVICE);
 			ATL1E_SET_PCIMAP_TYPE(tx_buffer, ATL1E_TX_PCIMAP_PAGE);
 			use_tpd->buffer_addr = cpu_to_le64(tx_buffer->dma);
 			use_tpd->word2 = (use_tpd->word2 & (~TPD_BUFLEN_MASK)) |
-- 
1.7.2.5

  parent reply	other threads:[~2011-08-30  9:18 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-30  9:17 [PATCH 0/14] skb fragment API: convert network drivers (part I) Ian Campbell
2011-08-30  9:18 ` [PATCH 01/14] 3c59x: convert to SKB paged frag API Ian Campbell
2011-08-30  9:18 ` [PATCH 02/14] 8139cp: " Ian Campbell
2011-08-30  9:18 ` [PATCH 03/14] acenic: " Ian Campbell
2011-08-30  9:18 ` [PATCH 04/14] atl1c: " Ian Campbell
2011-08-30  9:34   ` [PATCH] MAINTAINERS: Update ATLX driver maintainers Ian Campbell
2011-08-30 11:25     ` Franco Fichtner
2011-08-30 11:31       ` Ian Campbell
2011-08-30  9:18 ` Ian Campbell [this message]
2011-08-30  9:18 ` [PATCH 06/14] atlx: convert to SKB paged frag API Ian Campbell
2011-08-30  9:18 ` [PATCH 07/14] benet: " Ian Campbell
2011-08-30  9:18 ` [PATCH 08/14] bna: " Ian Campbell
2011-08-30  9:42   ` [PATCH] MAINTAINERS: Update BNA 10G Maintainer Ian Campbell
2011-08-31  0:44     ` David Miller
2011-08-30  9:18 ` [PATCH 09/14] cassini: convert to SKB paged frag API Ian Campbell
2011-08-30  9:18 ` [PATCH 10/14] intel: " Ian Campbell
2011-08-30 10:52   ` Jeff Kirsher
2011-08-30  9:18 ` [PATCH 11/14] enic: " Ian Campbell
2011-08-30  9:41   ` [PATCH] MAINTAINERS: Update Cisco VIC driver maintainers Ian Campbell
2011-08-30 11:42     ` David Wang (dwang2)
2011-08-31  0:43     ` David Miller
2011-08-30  9:18 ` [PATCH 12/14] forcedeth: convert to SKB paged frag API Ian Campbell
2011-08-30  9:18 ` [PATCH 13/14] gianfar: " Ian Campbell
2011-08-30  9:18 ` [PATCH 14/14] greth: " Ian Campbell
2011-08-30 22:05 ` [PATCH 0/14] skb fragment API: convert network drivers (part I) David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1314695910-22344-5-git-send-email-ian.campbell@citrix.com \
    --to=ian.campbell@citrix.com \
    --cc=chris.snook@gmail.com \
    --cc=jcliburn@gmail.com \
    --cc=jie.yang@atheros.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.