X-Git-Url: http://bbs.cooldavid.org/git/?p=jme.git;a=blobdiff_plain;f=jme.h;h=fff5d6b076860f03cd84473803efacebc4d4d6d1;hp=3a0e657db458b56733431b07b4f1fefe2784edd0;hb=9d5b3d673822292ba149d3b15a6649e5b6c75f4a;hpb=dc4185bdcf8f45d7cd1d09cd93b246d6a3a4e430

diff --git a/jme.h b/jme.h
index 3a0e657..fff5d6b 100644
--- a/jme.h
+++ b/jme.h
@@ -26,7 +26,7 @@
 #define __JME_H_INCLUDED__
 
 #define DRV_NAME	"jme"
-#define DRV_VERSION	"1.0.7-jmmod"
+#define DRV_VERSION	"1.0.8-jmmod"
 #define PFX		DRV_NAME ": "
 
 #define PCI_DEVICE_ID_JMICRON_JMC250	0x0250
@@ -638,7 +638,7 @@ enum jme_iomap_offsets {
 
 enum jme_iomap_lens {
 	JME_MAC_LEN	= 0x80,
-	JME_PHY_LEN	= 0x58,
+	JME_PHY_LEN	= 0x70,
 	JME_MISC_LEN	= 0x98,
 	JME_RSS_LEN	= 0xFF,
 };
@@ -676,7 +676,7 @@ enum jme_iomap_regs {
 	JME_PHY_LINK	= JME_PHY | 0x30, /* PHY Link Status Register */
 	JME_SMBCSR	= JME_PHY | 0x40, /* SMB Control and Status */
 	JME_SMBINTF	= JME_PHY | 0x44, /* SMB Interface */
-
+	JME_EXGP2	= JME_PHY | 0x60, /* General Purpose */			//Aries undo
 
 	JME_TMCSR	= JME_MISC | 0x00, /* Timer Control/Status Register */
 	JME_GPREG0	= JME_MISC | 0x08, /* General purpose REG-0 */
@@ -943,6 +943,10 @@ enum jme_smi_bit_shift {
 	SMI_REG_ADDR_SHIFT	= 11,
 	SMI_PHY_ADDR_SHIFT	= 6,
 };
+//Aries undo
+enum jme_phy_GeneralPurpose_bit {
+	FIX_IPV6_CHECKSUM		= 0x40000000,
+};
 
 static inline u32 smi_reg_addr(int x)
 {
@@ -1398,6 +1402,7 @@ static inline int new_phy_power_ctrl(u8 chip_main_rev)
  */
 static int jme_set_settings(struct net_device *netdev,
 				struct ethtool_cmd *ecmd);
+static void jme_set_unicastaddr(struct net_device *netdev);
 static void jme_set_multi(struct net_device *netdev);
 
 #endif