From: Ian Campbell <ian.campbell@citrix.com>
To: netdev@vger.kernel.org
Cc: Ian Campbell <ian.campbell@citrix.com>,
Sathya Perla <sathya.perla@emulex.com>,
Subbu Seetharaman <subbu.seetharaman@emulex.com>,
Ajit Khaparde <ajit.khaparde@emulex.com>
Subject: [PATCH 07/14] benet: convert to SKB paged frag API.
Date: Tue, 30 Aug 2011 10:18:23 +0100 [thread overview]
Message-ID: <1314695910-22344-7-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: Sathya Perla <sathya.perla@emulex.com>
Cc: Subbu Seetharaman <subbu.seetharaman@emulex.com>
Cc: Ajit Khaparde <ajit.khaparde@emulex.com>
Cc: netdev@vger.kernel.org
---
drivers/net/ethernet/emulex/benet/be_main.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index fb2eda0..59d54d1 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -638,8 +638,8 @@ static int make_tx_wrbs(struct be_adapter *adapter, struct be_queue_info *txq,
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
struct skb_frag_struct *frag =
&skb_shinfo(skb)->frags[i];
- busaddr = dma_map_page(dev, frag->page, frag->page_offset,
- frag->size, DMA_TO_DEVICE);
+ busaddr = skb_frag_dma_map(dev, frag, 0,
+ frag->size, DMA_TO_DEVICE);
if (dma_mapping_error(dev, busaddr))
goto dma_err;
wrb = queue_head_node(txq);
@@ -1066,7 +1066,7 @@ static void skb_fill_rx_data(struct be_adapter *adapter, struct be_rx_obj *rxo,
skb->tail += curr_frag_len;
} else {
skb_shinfo(skb)->nr_frags = 1;
- skb_shinfo(skb)->frags[0].page = page_info->page;
+ skb_frag_set_page(skb, 0, page_info->page);
skb_shinfo(skb)->frags[0].page_offset =
page_info->page_offset + hdr_len;
skb_shinfo(skb)->frags[0].size = curr_frag_len - hdr_len;
@@ -1091,7 +1091,7 @@ static void skb_fill_rx_data(struct be_adapter *adapter, struct be_rx_obj *rxo,
if (page_info->page_offset == 0) {
/* Fresh page */
j++;
- skb_shinfo(skb)->frags[j].page = page_info->page;
+ skb_frag_set_page(skb, j, page_info->page);
skb_shinfo(skb)->frags[j].page_offset =
page_info->page_offset;
skb_shinfo(skb)->frags[j].size = 0;
@@ -1173,7 +1173,7 @@ static void be_rx_compl_process_gro(struct be_adapter *adapter,
if (i == 0 || page_info->page_offset == 0) {
/* First frag or Fresh page */
j++;
- skb_shinfo(skb)->frags[j].page = page_info->page;
+ skb_frag_set_page(skb, j, page_info->page);
skb_shinfo(skb)->frags[j].page_offset =
page_info->page_offset;
skb_shinfo(skb)->frags[j].size = 0;
--
1.7.2.5
next prev 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 ` [PATCH 05/14] atl1e: convert to SKB paged frag API Ian Campbell
2011-08-30 9:18 ` [PATCH 06/14] atlx: " Ian Campbell
2011-08-30 9:18 ` Ian Campbell [this message]
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-7-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=ajit.khaparde@emulex.com \
--cc=netdev@vger.kernel.org \
--cc=sathya.perla@emulex.com \
--cc=subbu.seetharaman@emulex.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).