diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2010-08-03 11:48:35 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-03 16:40:53 -0700 |
| commit | 96f2bd13bfb6df5beec7fe55405ad94b528b8b4c (patch) | |
| tree | 6318e04d96d8f18bb0a39be9d7e2273c7a97637b | |
| parent | 5c7bf2f4d6304ab4741f38365ca0c0223147263d (diff) | |
| download | kernel_samsung_smdk4412-96f2bd13bfb6df5beec7fe55405ad94b528b8b4c.zip kernel_samsung_smdk4412-96f2bd13bfb6df5beec7fe55405ad94b528b8b4c.tar.gz kernel_samsung_smdk4412-96f2bd13bfb6df5beec7fe55405ad94b528b8b4c.tar.bz2 | |
e1000e: correct MAC-PHY interconnect register offset for 82579
The MAC-PHY interconnect register set on ICH/PCH parts is accessed through
a peephole mechanism by writing an offset to a CSR register. The offset
for the interconnect's half-duplex control register (which is used in a
jumbo frame workaround for 82579) is incorrect.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/e1000e/hw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h index a419b07..66ed08f 100644 --- a/drivers/net/e1000e/hw.h +++ b/drivers/net/e1000e/hw.h @@ -313,7 +313,7 @@ enum e1e_registers { #define E1000_KMRNCTRLSTA_DIAG_NELPBK 0x1000 /* Nearend Loopback mode */ #define E1000_KMRNCTRLSTA_K1_CONFIG 0x7 #define E1000_KMRNCTRLSTA_K1_ENABLE 0x0002 -#define E1000_KMRNCTRLSTA_HD_CTRL 0x0002 +#define E1000_KMRNCTRLSTA_HD_CTRL 0x10 /* Kumeran HD Control */ #define IFE_PHY_EXTENDED_STATUS_CONTROL 0x10 #define IFE_PHY_SPECIAL_CONTROL 0x11 /* 100BaseTx PHY Special Control */ |