From: Ian Campbell <Ian.Campbell@citrix.com>
Date: Wed, 31 Aug 2011 00:46:54 +0000 (+0000)
Subject: jme: convert to SKB paged frag API.
X-Git-Tag: bp-1.0.8.9-noasd~11
X-Git-Url: https://bbs.cooldavid.org/git/?p=jme.git;a=commitdiff_plain;h=c6324444cf3c9d4ae28f3e760297933bf84da7ce

jme: convert to SKB paged frag API.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Guo-Fu Tseng <cooldavid@cooldavid.org>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/jme.c b/jme.c
index 2695a8e..ed558dc 100644
--- a/jme.c
+++ b/jme.c
@@ -2002,8 +2002,14 @@ jme_map_tx_skb(struct jme_adapter *jme, struct sk_buff *skb, int idx)
 		ctxdesc = txdesc + ((idx + i + 2) & (mask));
 		ctxbi = txbi + ((idx + i + 2) & (mask));
 
+#ifndef __USE_SKB_FRAG_API__
 		jme_fill_tx_map(jme->pdev, ctxdesc, ctxbi, frag->page,
 				 frag->page_offset, frag->size, hidma);
+#else
+		jme_fill_tx_map(jme->pdev, ctxdesc, ctxbi,
+				skb_frag_page(frag),
+				frag->page_offset, frag->size, hidma);
+#endif
 	}
 
 	len = skb_is_nonlinear(skb) ? skb_headlen(skb) : skb->len;
diff --git a/jme.h b/jme.h
index 126f6fa..b758570 100644
--- a/jme.h
+++ b/jme.h
@@ -121,6 +121,10 @@ do {									\
 #define __USE_NDO_SET_RX_MODE__
 #endif
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+#define __USE_SKB_FRAG_API__
+#endif
+
 /*
  * Extra PCI Configuration space interface
  */