diff options
author | Ian Campbell <Ian.Campbell@citrix.com> | 2011-10-09 21:11:38 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-10-10 15:19:13 -0400 |
commit | 618c4a0ad41a42edd4f06259623f78f2e8da66e8 (patch) | |
tree | 18ed614dc6a32be46da4c9e2b57f6a099b329307 /drivers/net/ethernet/ibm | |
parent | 95f5f803b3897f622c4b5f72d554874faf74df12 (diff) |
ehea: convert to SKB paged frag API
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Breno Leitao <leitao@linux.vnet.ibm.com>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ibm')
-rw-r--r-- | 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 c821cb653999..dfefe809c485 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, | |||
1817 | sg1entry->l_key = lkey; | 1817 | sg1entry->l_key = lkey; |
1818 | sg1entry->len = frag->size; | 1818 | sg1entry->len = frag->size; |
1819 | sg1entry->vaddr = | 1819 | sg1entry->vaddr = |
1820 | ehea_map_vaddr(page_address(frag->page) | 1820 | ehea_map_vaddr(skb_frag_address(frag)); |
1821 | + frag->page_offset); | ||
1822 | swqe->descriptors++; | 1821 | swqe->descriptors++; |
1823 | sg1entry_contains_frag_data = 1; | 1822 | sg1entry_contains_frag_data = 1; |
1824 | } | 1823 | } |
@@ -1830,9 +1829,7 @@ static inline void write_swqe2_data(struct sk_buff *skb, struct net_device *dev, | |||
1830 | 1829 | ||
1831 | sgentry->l_key = lkey; | 1830 | sgentry->l_key = lkey; |
1832 | sgentry->len = frag->size; | 1831 | sgentry->len = frag->size; |
1833 | sgentry->vaddr = | 1832 | sgentry->vaddr = ehea_map_vaddr(skb_frag_address(frag)); |
1834 | ehea_map_vaddr(page_address(frag->page) | ||
1835 | + frag->page_offset); | ||
1836 | swqe->descriptors++; | 1833 | swqe->descriptors++; |
1837 | } | 1834 | } |
1838 | } | 1835 | } |
@@ -2222,9 +2219,7 @@ static void ehea_xmit3(struct sk_buff *skb, struct net_device *dev, | |||
2222 | /* ... then copy data from the fragments */ | 2219 | /* ... then copy data from the fragments */ |
2223 | for (i = 0; i < nfrags; i++) { | 2220 | for (i = 0; i < nfrags; i++) { |
2224 | frag = &skb_shinfo(skb)->frags[i]; | 2221 | frag = &skb_shinfo(skb)->frags[i]; |
2225 | memcpy(imm_data, | 2222 | memcpy(imm_data, skb_frag_address(frag), frag->size); |
2226 | page_address(frag->page) + frag->page_offset, | ||
2227 | frag->size); | ||
2228 | imm_data += frag->size; | 2223 | imm_data += frag->size; |
2229 | } | 2224 | } |
2230 | } | 2225 | } |