aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/e1000e/defines.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-07-05 19:06:45 -0700
committerDavid S. Miller <davem@davemloft.net>2009-07-05 19:06:45 -0700
commit6b1344724e10c166d9e3c17011ed879ddf302e94 (patch)
treebbfa98b183c1249a58ad2debdb696392d8c4a029 /drivers/net/e1000e/defines.h
parent8e4a718ff38d8539938ec3421935904c27e00c39 (diff)
parent1ded3f59f35a2642852b3e2a1c0fa8a97777e9af (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/e1000e/defines.h')
-rw-r--r--drivers/net/e1000e/defines.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/e1000e/defines.h b/drivers/net/e1000e/defines.h
index 8890c97e112..c0f185beb8b 100644
--- a/drivers/net/e1000e/defines.h
+++ b/drivers/net/e1000e/defines.h
@@ -238,6 +238,7 @@
#define E1000_STATUS_SPEED_100 0x00000040 /* Speed 100Mb/s */
#define E1000_STATUS_SPEED_1000 0x00000080 /* Speed 1000Mb/s */
#define E1000_STATUS_LAN_INIT_DONE 0x00000200 /* Lan Init Completion by NVM */
+#define E1000_STATUS_PHYRA 0x00000400 /* PHY Reset Asserted */
#define E1000_STATUS_GIO_MASTER_ENABLE 0x00080000 /* Status of Master requests. */
/* Constants used to interpret the masked PCI-X bus speed. */
@@ -575,6 +576,8 @@
#define PHY_1000T_STATUS 0x0A /* 1000Base-T Status Reg */
#define PHY_EXT_STATUS 0x0F /* Extended Status Reg */
+#define PHY_CONTROL_LB 0x4000 /* PHY Loopback bit */
+
/* NVM Control */
#define E1000_EECD_SK 0x00000001 /* NVM Clock */
#define E1000_EECD_CS 0x00000002 /* NVM Chip Select */