Update version number

[jme.git] / jme.h

diff --git a/jme.h b/jme.h
index 7c0771534a6167f36d7eb6cba461e304abde2a16..9089116c9de80ba271805ca652b7cc2b7d384659 100644 (file)
--- a/jme.h
+++ b/jme.h
@@ -24,9 +24,10 @@
 
 #ifndef __JME_H_INCLUDED__
 #define __JME_H_INCLUDED__
+#include <linux/interrupt.h>
 
 #define DRV_NAME       "jme"
-#define DRV_VERSION    "1.0.8-jmmod"
+#define DRV_VERSION    "1.0.8.1-jmmod"
 #define PFX            DRV_NAME ": "
 
 #define PCI_DEVICE_ID_JMICRON_JMC250   0x0250
@@ -42,11 +43,11 @@
        NETIF_MSG_TX_ERR | \
        NETIF_MSG_HW)
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,23)
+#ifndef pr_err
 #define pr_err(fmt, arg...) \
        printk(KERN_ERR fmt, ##arg)
 #endif
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,33)
+#ifndef netdev_err
 #define netdev_err(netdev, fmt, arg...) \
        pr_err(fmt, ##arg)
 #endif
@@ -94,11 +95,15 @@ do {                                                                        \
 #define msg_hw(priv, fmt, args...) \
        jme_msg(KERN_ERR, hw, priv, fmt, ## args)
 
+#ifndef netif_info
 #define netif_info(priv, type, dev, fmt, args...) \
        msg_ ## type(priv, fmt, ## args)
+#endif
+#ifndef netif_err
 #define netif_err(priv, type, dev, fmt, args...) \
        msg_ ## type(priv, fmt, ## args)
 #endif
+#endif
 
 #ifndef NETIF_F_TSO6
 #define NETIF_F_TSO6 0
@@ -534,6 +539,13 @@ static inline struct tcphdr *tcp_hdr(const struct sk_buff *skb)
 #define JME_NEW_PM_API
 #endif
 
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,26)
+static inline __u32 ethtool_cmd_speed(struct ethtool_cmd *ep)
+{
+       return ep->speed;
+}
+#endif
+
 /*
  * Jmac Adapter Private data
  */