From: Ian Campbell <ian.campbell@citrix.com>
To: netdev@vger.kernel.org
Cc: Ian Campbell <ian.campbell@citrix.com>,
Breno Leitao <leitao@linux.vnet.ibm.com>
Subject: [PATCH 6/9] ehea: convert to SKB paged frag API
Date: Mon, 10 Oct 2011 12:11:38 +0100 [thread overview]
Message-ID: <1318245101-16890-6-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1318245076.21903.408.camel@zakaz.uk.xensource.com>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Breno Leitao <leitao@linux.vnet.ibm.com>
Cc: netdev@vger.kernel.org
---
drivers/net/ethernet/ibm/ehea/ehea_main.c | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index c821cb6..dfefe80 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -1817,8 +1817,7 @@ static inline void write_swqe2_data(struct sk_buff *skb, struct net_device *dev,
sg1entry->l_key = lkey;
sg1entry->len = frag->size;
sg1entry->vaddr =
- ehea_map_vaddr(page_address(frag->page)
- + frag->page_offset);
+ ehea_map_vaddr(skb_frag_address(frag));
swqe->descriptors++;
sg1entry_contains_frag_data = 1;
}
@@ -1830,9 +1829,7 @@ static inline void write_swqe2_data(struct sk_buff *skb, struct net_device *dev,
sgentry->l_key = lkey;
sgentry->len = frag->size;
- sgentry->vaddr =
- ehea_map_vaddr(page_address(frag->page)
- + frag->page_offset);
+ sgentry->vaddr = ehea_map_vaddr(skb_frag_address(frag));
swqe->descriptors++;
}
}
@@ -2222,9 +2219,7 @@ static void ehea_xmit3(struct sk_buff *skb, struct net_device *dev,
/* ... then copy data from the fragments */
for (i = 0; i < nfrags; i++) {
frag = &skb_shinfo(skb)->frags[i];
- memcpy(imm_data,
- page_address(frag->page) + frag->page_offset,
- frag->size);
+ memcpy(imm_data, skb_frag_address(frag), frag->size);
imm_data += frag->size;
}
}
--
1.7.2.5
next prev parent reply other threads:[~2011-10-10 11:11 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-10 11:11 [PATCH 0/9] skb fragment API: convert network drivers (part V) Ian Campbell
2011-10-10 11:11 ` [PATCH 1/9] mm: add a "struct subpage" type containing a page, offset and length Ian Campbell
2011-10-10 12:27 ` Ian Campbell
2011-10-10 15:55 ` Christoph Hellwig
2011-10-10 16:10 ` Ian Campbell
2011-10-10 16:19 ` Christoph Hellwig
2011-10-10 16:27 ` Ian Campbell
2011-10-10 11:11 ` [PATCH 2/9] mlx4: convert to SKB paged frag API Ian Campbell
2011-10-10 11:11 ` [PATCH 3/9] cxgb4: " Ian Campbell
2011-10-10 11:11 ` [PATCH 4/9] cxgb4vf: " Ian Campbell
2011-10-10 11:11 ` [PATCH 5/9] cxgbi: " Ian Campbell
2011-10-10 11:11 ` Ian Campbell [this message]
2011-10-10 11:11 ` [PATCH 7/9] emac: " Ian Campbell
2011-10-10 11:11 ` [PATCH 8/9] ll_temac: " Ian Campbell
2011-10-10 11:11 ` [PATCH 9/9] net: add opaque struct around skb frag page Ian Campbell
2011-10-10 15:09 ` Eric Dumazet
2011-10-10 15:13 ` Ian Campbell
2011-10-10 18:20 ` [PATCH 0/9] skb fragment API: convert network drivers (part V) David Miller
2011-10-10 18:52 ` Eric Dumazet
2011-10-10 19:16 ` David Miller
2011-10-10 19:17 ` Ian Campbell
2011-10-10 19:18 ` David Miller
2011-10-10 19:42 ` Eric Dumazet
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=1318245101-16890-6-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=leitao@linux.vnet.ibm.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 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).