Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93a23f48 authored by Bruce Allan's avatar Bruce Allan Committed by David S. Miller
Browse files

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: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3dc78932

drivers/net/e1000e/defines.h

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
#define E1000_WUS_BC           E1000_WUFC_BC



/* Extended Device Control */

#define E1000_CTRL_EXT_SDP7_DATA 0x00000080 /* Value of SW Definable Pin 7 */

#define E1000_CTRL_EXT_SDP3_DATA 0x00000080 /* Value of SW Definable Pin 3 */

#define E1000_CTRL_EXT_EE_RST    0x00002000 /* Reinitialize from EEPROM */

#define E1000_CTRL_EXT_SPD_BYPS  0x00008000 /* Speed Select Bypass */

#define E1000_CTRL_EXT_RO_DIS    0x00020000 /* Relaxed Ordering disable */

drivers/net/e1000e/netdev.c

+1 −1
Original line number Diff line number Diff line
@@ -4541,7 +4541,7 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake) 
		    e1000_media_type_internal_serdes) {

			/* keep the laser running in D3 */

			ctrl_ext = er32(CTRL_EXT);

			ctrl_ext |= E1000_CTRL_EXT_SDP7_DATA;

			ctrl_ext |= E1000_CTRL_EXT_SDP3_DATA;

			ew32(CTRL_EXT, ctrl_ext);

		}