diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2009-12-08 02:27:41 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-08 23:10:11 -0500 |
commit | 93a23f48df9c0111283302acd2a4ed2ef1d86453 (patch) | |
tree | 0003f6b86cc8e17dda316352a472978922ceb3b2 /drivers/net/e1000e | |
parent | 3dc789320e1b310cb505dcd94512c279abcd5e1c (diff) |
e1000e: minor correction to name of bit in CTRL_EXT register
Bit 7 in the CTRL_REG register is actually the Software Definable Pin 3,
not the Software Definable Pin 7.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000e')
-rw-r--r-- | drivers/net/e1000e/defines.h | 2 | ||||
-rw-r--r-- | drivers/net/e1000e/netdev.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000e/defines.h b/drivers/net/e1000e/defines.h index 86d2809763c3..e02e38221ed4 100644 --- a/drivers/net/e1000e/defines.h +++ b/drivers/net/e1000e/defines.h | |||
@@ -74,7 +74,7 @@ | |||
74 | #define E1000_WUS_BC E1000_WUFC_BC | 74 | #define E1000_WUS_BC E1000_WUFC_BC |
75 | 75 | ||
76 | /* Extended Device Control */ | 76 | /* Extended Device Control */ |
77 | #define E1000_CTRL_EXT_SDP7_DATA 0x00000080 /* Value of SW Definable Pin 7 */ | 77 | #define E1000_CTRL_EXT_SDP3_DATA 0x00000080 /* Value of SW Definable Pin 3 */ |
78 | #define E1000_CTRL_EXT_EE_RST 0x00002000 /* Reinitialize from EEPROM */ | 78 | #define E1000_CTRL_EXT_EE_RST 0x00002000 /* Reinitialize from EEPROM */ |
79 | #define E1000_CTRL_EXT_SPD_BYPS 0x00008000 /* Speed Select Bypass */ | 79 | #define E1000_CTRL_EXT_SPD_BYPS 0x00008000 /* Speed Select Bypass */ |
80 | #define E1000_CTRL_EXT_RO_DIS 0x00020000 /* Relaxed Ordering disable */ | 80 | #define E1000_CTRL_EXT_RO_DIS 0x00020000 /* Relaxed Ordering disable */ |
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index c3105c5087e0..762b697ce731 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
@@ -4541,7 +4541,7 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake) | |||
4541 | e1000_media_type_internal_serdes) { | 4541 | e1000_media_type_internal_serdes) { |
4542 | /* keep the laser running in D3 */ | 4542 | /* keep the laser running in D3 */ |
4543 | ctrl_ext = er32(CTRL_EXT); | 4543 | ctrl_ext = er32(CTRL_EXT); |
4544 | ctrl_ext |= E1000_CTRL_EXT_SDP7_DATA; | 4544 | ctrl_ext |= E1000_CTRL_EXT_SDP3_DATA; |
4545 | ew32(CTRL_EXT, ctrl_ext); | 4545 | ew32(CTRL_EXT, ctrl_ext); |
4546 | } | 4546 | } |
4547 | 4547 | ||