From 48abc947fe4abac564c82a76d6d0212e5eded463 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 10 Oct 2011 01:11:38 +0000 Subject: [PATCH] --- yaml --- r: 266483 b: refs/heads/master c: 618c4a0ad41a42edd4f06259623f78f2e8da66e8 h: refs/heads/master i: 266481: 6e5273689a0db8d90e345e0cb1f543110226fb1a 266479: 6734157235b3449d4efd8c829ca15ca177b60d2c v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/ibm/ehea/ehea_main.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 66c4ff14e91d..4475b63bf769 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95f5f803b3897f622c4b5f72d554874faf74df12 +refs/heads/master: 618c4a0ad41a42edd4f06259623f78f2e8da66e8 diff --git a/trunk/drivers/net/ethernet/ibm/ehea/ehea_main.c b/trunk/drivers/net/ethernet/ibm/ehea/ehea_main.c index c821cb653999..dfefe809c485 100644 --- a/trunk/drivers/net/ethernet/ibm/ehea/ehea_main.c +++ b/trunk/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; } }