From: Ian Campbell <ian.campbell@citrix.com>
To: netdev@vger.kernel.org
Cc: Ian Campbell <ian.campbell@citrix.com>,
Shreyas Bhatewara <sbhatewara@vmware.com>,
"VMware, Inc." <pv-drivers@vmware.com>
Subject: [PATCH 14/14] vmxnet3: convert to SKB paged frag API.
Date: Thu, 22 Sep 2011 08:53:28 +0100 [thread overview]
Message-ID: <1316678008-16842-14-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1316677996.23371.10.camel@zakaz.uk.xensource.com>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Shreyas Bhatewara <sbhatewara@vmware.com>
Cc: "VMware, Inc." <pv-drivers@vmware.com>
Cc: netdev@vger.kernel.org
---
drivers/net/vmxnet3/vmxnet3_drv.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 759c1a4..57e7c66 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -654,7 +654,7 @@ vmxnet3_append_frag(struct sk_buff *skb, struct Vmxnet3_RxCompDesc *rcd,
BUG_ON(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS);
- frag->page = rbi->page;
+ __skb_frag_set_page(frag, rbi->page);
frag->page_offset = 0;
frag->size = rcd->len;
skb->data_len += frag->size;
@@ -748,9 +748,9 @@ vmxnet3_map_pkt(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx,
tbi = tq->buf_info + tq->tx_ring.next2fill;
tbi->map_type = VMXNET3_MAP_PAGE;
- tbi->dma_addr = pci_map_page(adapter->pdev, frag->page,
- frag->page_offset, frag->size,
- PCI_DMA_TODEVICE);
+ tbi->dma_addr = skb_frag_dma_map(&adapter->pdev->dev, frag,
+ 0, frag->size,
+ PCI_DMA_TODEVICE);
tbi->len = frag->size;
--
1.7.2.5
next prev parent reply other threads:[~2011-09-22 7:53 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-22 7:53 [PATCH 0/14] skb fragment API: convert network drivers (part III) Ian Campbell
2011-09-22 7:53 ` [PATCH 01/14] s2io: convert to SKB paged frag API Ian Campbell
2011-09-22 7:53 ` [PATCH 02/14] sfc: " Ian Campbell
2011-09-22 7:53 ` [PATCH 03/14] skge: " Ian Campbell
2011-09-22 7:53 ` [PATCH 04/14] sky2: " Ian Campbell
2011-09-22 7:53 ` [PATCH 05/14] starfire: " Ian Campbell
2011-09-22 7:53 ` [PATCH 06/14] stmmac: " Ian Campbell
2011-09-22 7:53 ` [PATCH 07/14] sungem: " Ian Campbell
2011-09-22 7:53 ` [PATCH 08/14] sunhme: " Ian Campbell
2011-09-22 7:53 ` [PATCH 09/14] tehuti: " Ian Campbell
2011-09-22 8:08 ` [PATCH] MAINTAINERS: tehuti: Alexander Indenbaum's address bounces Ian Campbell
2011-09-29 4:32 ` David Miller
2011-09-22 7:53 ` [PATCH 10/14] tsi108: convert to SKB paged frag API Ian Campbell
2011-09-22 7:53 ` [PATCH 11/14] typhoon: " Ian Campbell
2011-09-22 7:53 ` [PATCH 12/14] via-velocity: " Ian Campbell
2011-09-22 7:53 ` [PATCH 13/14] virtionet: " Ian Campbell
2011-09-22 7:53 ` Ian Campbell [this message]
2011-09-22 16:30 ` [Pv-drivers] [PATCH 14/14] vmxnet3: " Bhavesh Davda
2011-09-22 16:46 ` Ian Campbell
2011-09-22 16:49 ` Bhavesh Davda
2011-09-22 20:05 ` [PATCH 0/14] skb fragment API: convert network drivers (part III) 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=1316678008-16842-14-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=netdev@vger.kernel.org \
--cc=pv-drivers@vmware.com \
--cc=sbhatewara@vmware.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).