Commit 618c4a0a authored by Ian Campbell's avatar Ian Campbell Committed by David S. Miller

ehea: convert to SKB paged frag API

Signed-off-by: default avatarIan Campbell <ian.campbell@citrix.com>
Cc: Breno Leitao <leitao@linux.vnet.ibm.com>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 95f5f803
...@@ -1817,8 +1817,7 @@ static inline void write_swqe2_data(struct sk_buff *skb, struct net_device *dev, ...@@ -1817,8 +1817,7 @@ static inline void write_swqe2_data(struct sk_buff *skb, struct net_device *dev,
sg1entry->l_key = lkey; sg1entry->l_key = lkey;
sg1entry->len = frag->size; sg1entry->len = frag->size;
sg1entry->vaddr = sg1entry->vaddr =
ehea_map_vaddr(page_address(frag->page) ehea_map_vaddr(skb_frag_address(frag));
+ frag->page_offset);
swqe->descriptors++; swqe->descriptors++;
sg1entry_contains_frag_data = 1; sg1entry_contains_frag_data = 1;
} }
...@@ -1830,9 +1829,7 @@ static inline void write_swqe2_data(struct sk_buff *skb, struct net_device *dev, ...@@ -1830,9 +1829,7 @@ static inline void write_swqe2_data(struct sk_buff *skb, struct net_device *dev,
sgentry->l_key = lkey; sgentry->l_key = lkey;
sgentry->len = frag->size; sgentry->len = frag->size;
sgentry->vaddr = sgentry->vaddr = ehea_map_vaddr(skb_frag_address(frag));
ehea_map_vaddr(page_address(frag->page)
+ frag->page_offset);
swqe->descriptors++; swqe->descriptors++;
} }
} }
...@@ -2222,9 +2219,7 @@ static void ehea_xmit3(struct sk_buff *skb, struct net_device *dev, ...@@ -2222,9 +2219,7 @@ static void ehea_xmit3(struct sk_buff *skb, struct net_device *dev,
/* ... then copy data from the fragments */ /* ... then copy data from the fragments */
for (i = 0; i < nfrags; i++) { for (i = 0; i < nfrags; i++) {
frag = &skb_shinfo(skb)->frags[i]; frag = &skb_shinfo(skb)->frags[i];
memcpy(imm_data, memcpy(imm_data, skb_frag_address(frag), frag->size);
page_address(frag->page) + frag->page_offset,
frag->size);
imm_data += frag->size; imm_data += frag->size;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment