X-Git-Url: http://bbs.cooldavid.org/git/?p=jme.git;a=blobdiff_plain;f=jme.h;h=aed3e8e0f2027ce66cdd47ec88f820731b8b4513;hp=317a28e7a02548a02b51a2e7a4191c553ce92a83;hb=58c92f2882c12119135005d46bd8656070283513;hpb=cd0ff491e3c0fdb01fb189987c4d822b1113cc53

diff --git a/jme.h b/jme.h
index 317a28e..aed3e8e 100644
--- a/jme.h
+++ b/jme.h
@@ -25,7 +25,7 @@
 #define __JME_H_INCLUDEE__
 
 #define DRV_NAME	"jme"
-#define DRV_VERSION	"1.0"
+#define DRV_VERSION	"1.0.2"
 #define PFX		DRV_NAME ": "
 
 #define PCI_DEVICE_ID_JMICRON_JMC250	0x0250
@@ -387,10 +387,34 @@ struct jme_ring {
 	atomic_t nr_free;
 };
 
-#define NET_STAT(priv) (priv->dev->stats)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,21)
+#define NET_STAT(priv) priv->stats
+#define NETDEV_GET_STATS(netdev, fun_ptr) \
+	netdev->get_stats = fun_ptr
+#define DECLARE_NET_DEVICE_STATS struct net_device_stats stats;
+#else
+#define NET_STAT(priv) priv->dev->stats
 #define NETDEV_GET_STATS(netdev, fun_ptr)
 #define DECLARE_NET_DEVICE_STATS
+#endif
 
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,23)
+#define DECLARE_NAPI_STRUCT
+#define NETIF_NAPI_SET(dev, napis, pollfn, q) \
+	dev->poll = pollfn; \
+	dev->weight = q;
+#define JME_NAPI_HOLDER(holder) struct net_device *holder
+#define JME_NAPI_WEIGHT(w) int *w
+#define JME_NAPI_WEIGHT_VAL(w) *w
+#define JME_NAPI_WEIGHT_SET(w, r) *w = r
+#define JME_RX_COMPLETE(dev, napis) netif_rx_complete(dev)
+#define JME_NAPI_ENABLE(priv) netif_poll_enable(priv->dev);
+#define JME_NAPI_DISABLE(priv) netif_poll_disable(priv->dev);
+#define JME_RX_SCHEDULE_PREP(priv) \
+	netif_rx_schedule_prep(priv->dev)
+#define JME_RX_SCHEDULE(priv) \
+	__netif_rx_schedule(priv->dev);
+#else
 #define DECLARE_NAPI_STRUCT struct napi_struct napi;
 #define NETIF_NAPI_SET(dev, napis, pollfn, q) \
 	netif_napi_add(dev, napis, pollfn, q);
@@ -401,12 +425,13 @@ struct jme_ring {
 #define JME_RX_COMPLETE(dev, napis) netif_rx_complete(dev, napis)
 #define JME_NAPI_ENABLE(priv) napi_enable(&priv->napi);
 #define JME_NAPI_DISABLE(priv) \
-	if (!napi_disable_pending(&priv->napi)) \
+	if(!napi_disable_pending(&priv->napi)) \
 		napi_disable(&priv->napi);
 #define JME_RX_SCHEDULE_PREP(priv) \
 	netif_rx_schedule_prep(priv->dev, &priv->napi)
 #define JME_RX_SCHEDULE(priv) \
 	__netif_rx_schedule(priv->dev, &priv->napi);
+#endif
 
 /*
  * Jmac Adapter Private data
@@ -444,7 +469,7 @@ struct jme_adapter {
 	u32			rx_ring_mask;
 	u8			mrrs;
 	unsigned int		fpgaver;
-	unsigned int		chipver;
+	unsigned int		chiprev;
 	u8			rev;
 	u32			msg_enable;
 	struct ethtool_cmd	old_ecmd;
@@ -481,13 +506,23 @@ enum jme_flags_bits {
 #define JME_REG_LEN		0x500
 #define MAX_ETHERNET_JUMBO_PACKET_SIZE 9216
 
-static inline struct jme_adapter*
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,23)
+__always_inline static struct jme_adapter*
+jme_napi_priv(struct net_device *holder)
+{
+	struct jme_adapter* jme;
+	jme = netdev_priv(holder);
+	return jme;
+}
+#else
+__always_inline static struct jme_adapter*
 jme_napi_priv(struct napi_struct *napi)
 {
-	struct jme_adapter *jme;
+	struct jme_adapter* jme;
 	jme = container_of(napi, struct jme_adapter, napi);
 	return jme;
 }
+#endif
 
 /*
  * MMaped I/O Resters
@@ -1050,13 +1085,13 @@ enum jme_pcctx_bits {
  */
 enum jme_chipmode_bit_masks {
 	CM_FPGAVER_MASK		= 0xFFFF0000,
-	CM_CHIPVER_MASK		= 0x0000FF00,
+	CM_CHIPREV_MASK		= 0x0000FF00,
 	CM_CHIPMODE_MASK	= 0x0000000F,
 };
 
 enum jme_chipmode_shifts {
 	CM_FPGAVER_SHIFT	= 16,
-	CM_CHIPVER_SHIFT	= 8,
+	CM_CHIPREV_SHIFT	= 8,
 };
 
 /*
@@ -1112,7 +1147,7 @@ static inline void reg_dbg(const struct jme_adapter *jme,
 		const char *msg, u32 val, u32 reg)
 {
 	const char *regname;
-	switch(reg & 0xF00) {
+	switch (reg & 0xF00) {
 	case 0x000:
 		regname = MAC_REG_NAME[(reg & 0xFF) >> 2];
 		break;
@@ -1120,7 +1155,7 @@ static inline void reg_dbg(const struct jme_adapter *jme,
 		regname = PE_REG_NAME[(reg & 0xFF) >> 2];
 		break;
 	case 0x800:
-		regname = MISC_REG_NAME[(reg & 0xFF) >>2];
+		regname = MISC_REG_NAME[(reg & 0xFF) >> 2];
 		break;
 	default:
 		regname = PE_REG_NAME[0];
@@ -1178,6 +1213,14 @@ enum jme_phy_reg17_vals {
 
 #define BMSR_ANCOMP               0x0020
 
+/*
+ * Workaround
+ */
+static inline int is_buggy250(unsigned short device, unsigned int chiprev)
+{
+	return device == PCI_DEVICE_ID_JMICRON_JMC250 && chiprev == 0x11;
+}
+
 /*
  * Function prototypes
  */