Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/ethernet/ibm/ehea/ehea_main.c

+3 −8
Original line number Diff line number Diff line
@@ -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;

		}

	}