aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2009-05-26 09:51:05 -0400
committerDavid S. Miller <davem@davemloft.net>2009-05-26 23:35:06 -0400
commitcbe7a81a7370e2c4560b48e42e741bd1476bc700 (patch)
tree06909d59a09cac98dcfd6221b67a6bcf3bf6e6ff /drivers/net
parent3ea73afafb8cd237a823ec5d0a0a2f2396b03b33 (diff)
igb/e1000e: update PSSR_MDIX value to reflect correct bit
The phy port status register has the MDI-X status bit on bit 11, not bit 3 as is currently setup in the define. This patch corrects that so the correct bit is checked on igp PHY types. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Acked-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')
-rw-r--r--drivers/net/e1000e/hw.h2
-rw-r--r--drivers/net/igb/e1000_phy.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index d8b82296f41e..6cdb703be951 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -253,7 +253,7 @@ enum e1e_registers {
253#define IGP01E1000_PLHR_SS_DOWNGRADE 0x8000 253#define IGP01E1000_PLHR_SS_DOWNGRADE 0x8000
254 254
255#define IGP01E1000_PSSR_POLARITY_REVERSED 0x0002 255#define IGP01E1000_PSSR_POLARITY_REVERSED 0x0002
256#define IGP01E1000_PSSR_MDIX 0x0008 256#define IGP01E1000_PSSR_MDIX 0x0800
257#define IGP01E1000_PSSR_SPEED_MASK 0xC000 257#define IGP01E1000_PSSR_SPEED_MASK 0xC000
258#define IGP01E1000_PSSR_SPEED_1000MBPS 0xC000 258#define IGP01E1000_PSSR_SPEED_1000MBPS 0xC000
259 259
diff --git a/drivers/net/igb/e1000_phy.h b/drivers/net/igb/e1000_phy.h
index 3228a862031f..ebe4b616db8a 100644
--- a/drivers/net/igb/e1000_phy.h
+++ b/drivers/net/igb/e1000_phy.h
@@ -80,7 +80,7 @@ s32 igb_phy_init_script_igp3(struct e1000_hw *hw);
80#define IGP02E1000_PM_D3_LPLU 0x0004 /* For all other states */ 80#define IGP02E1000_PM_D3_LPLU 0x0004 /* For all other states */
81#define IGP01E1000_PLHR_SS_DOWNGRADE 0x8000 81#define IGP01E1000_PLHR_SS_DOWNGRADE 0x8000
82#define IGP01E1000_PSSR_POLARITY_REVERSED 0x0002 82#define IGP01E1000_PSSR_POLARITY_REVERSED 0x0002
83#define IGP01E1000_PSSR_MDIX 0x0008 83#define IGP01E1000_PSSR_MDIX 0x0800
84#define IGP01E1000_PSSR_SPEED_MASK 0xC000 84#define IGP01E1000_PSSR_SPEED_MASK 0xC000
85#define IGP01E1000_PSSR_SPEED_1000MBPS 0xC000 85#define IGP01E1000_PSSR_SPEED_1000MBPS 0xC000
86#define IGP02E1000_PHY_CHANNEL_NUM 4 86#define IGP02E1000_PHY_CHANNEL_NUM 4