From: Ian Campbell <Ian.Campbell@citrix.com>
Date: Wed, 31 Aug 2011 00:47:06 +0000 (+0000)
Subject: r8169: convert to SKB paged frag API.
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~52
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a39e8cd82fa3a1ca6a6f1fe1c0bd6da40c9a5d5c;p=users%2Fjedix%2Flinux-maple.git

r8169: convert to SKB paged frag API.

(cherry picked from commit 929f61896e194f45696ba52852ccbfd5edd04df1)
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Realtek linux nic maintainers <nic_swsd@realtek.com>
Cc: Francois Romieu <romieu@fr.zoreil.com>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index fe776612a3bf..dea381b39178 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -4909,7 +4909,7 @@ static int rtl8169_xmit_frags(struct rtl8169_private *tp, struct sk_buff *skb,
 
 		txd = tp->TxDescArray + entry;
 		len = frag->size;
-		addr = ((void *) page_address(frag->page)) + frag->page_offset;
+		addr = skb_frag_address(frag);
 		mapping = dma_map_single(d, addr, len, DMA_TO_DEVICE);
 		if (unlikely(dma_mapping_error(d, mapping))) {
 			if (net_ratelimit())