ethtool: Use full 32 bit speed range in ethtool's set_settings

[jme.git] / jme.h

diff --git a/jme.h b/jme.h
index 34f77a1906d2cdace5e8e297c129e88c94b61d1f..3dafe833ba2b284696f8adcb60f47995877fb3ec 100644 (file)
--- a/jme.h
+++ b/jme.h
@@ -24,6 +24,7 @@
 
 #ifndef __JME_H_INCLUDED__
 #define __JME_H_INCLUDED__
+#include <linux/interrupt.h>
 
 #define DRV_NAME       "jme"
 #define DRV_VERSION    "1.0.8-jmmod"
@@ -530,6 +531,17 @@ static inline struct tcphdr *tcp_hdr(const struct sk_buff *skb)
        __napi_schedule(&priv->napi);
 #endif
 
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38)
+#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
  */
@@ -993,6 +1005,7 @@ enum jme_ghc_txmac_clk {
  * Power management control and status register
  */
 enum jme_pmcs_bit_masks {
+       PMCS_STMASK     = 0xFFFF0000,
        PMCS_WF7DET     = 0x80000000,
        PMCS_WF6DET     = 0x40000000,
        PMCS_WF5DET     = 0x20000000,
@@ -1004,6 +1017,7 @@ enum jme_pmcs_bit_masks {
        PMCS_LFDET      = 0x00040000,
        PMCS_LRDET      = 0x00020000,
        PMCS_MFDET      = 0x00010000,
+       PMCS_ENMASK     = 0x0000FFFF,
        PMCS_WF7EN      = 0x00008000,
        PMCS_WF6EN      = 0x00004000,
        PMCS_WF5EN      = 0x00002000,