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 2695a8e324e2a05ff1a9ac2a6898e648f0ed4764..ed558dc55e9759725409a291704c0c40fa022388 100644 (file)
--- 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 126f6fafb471b7ea166074ee8d88553b12fe7e50..b7585705c8032e23011416a451aaa9305ac90724 100644 (file)
--- 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
  */