patch-2.4.0-test7 linux/drivers/net/tlan.h

Next file: linux/drivers/net/tulip/tulip_core.c
Previous file: linux/drivers/net/tlan.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test6/linux/drivers/net/tlan.h linux/drivers/net/tlan.h
@@ -187,6 +187,7 @@
 	u8			tlanFullDuplex;
 	char                    devName[8];
 	spinlock_t		lock;
+	u8			link;
 } TLanPrivateInfo;
 
 
@@ -197,7 +198,7 @@
 	 *
 	 ****************************************************************/
 
-#define TLAN_TIMER_LINK			1
+#define TLAN_TIMER_LINK_BEAT		1
 #define TLAN_TIMER_ACTIVITY		2
 #define TLAN_TIMER_PHY_PDOWN		3
 #define TLAN_TIMER_PHY_PUP		4
@@ -381,9 +382,9 @@
 #define 	MII_GIL_OUI		0xFC00
 #define 	MII_GIL_MODEL		0x03F0
 #define 	MII_GIL_REVISION	0x000F
-#define MII_AN_ADV			0x04
-#define MII_AN_LPA			0x05
-#define MII_AN_EXP			0x06
+#define MII_AN_ADV			0x0004
+#define MII_AN_LPA			0x0005
+#define MII_AN_EXP			0x0006
 
 /* ThunderLAN Specific MII/PHY Registers */
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)