igb/e1000e: update PSSR_MDIX value to reflect correct bit
authorAlexander Duyck <alexander.h.duyck@intel.com>
Tue, 26 May 2009 13:51:05 +0000 (13:51 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 27 May 2009 03:35:06 +0000 (20:35 -0700)
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>
drivers/net/e1000e/hw.h
drivers/net/igb/e1000_phy.h

index d8b8229..6cdb703 100644 (file)
@@ -253,7 +253,7 @@ enum e1e_registers {
 #define IGP01E1000_PLHR_SS_DOWNGRADE   0x8000
 
 #define IGP01E1000_PSSR_POLARITY_REVERSED      0x0002
-#define IGP01E1000_PSSR_MDIX                   0x0008
+#define IGP01E1000_PSSR_MDIX                   0x0800
 #define IGP01E1000_PSSR_SPEED_MASK             0xC000
 #define IGP01E1000_PSSR_SPEED_1000MBPS         0xC000
 
index 3228a86..ebe4b61 100644 (file)
@@ -80,7 +80,7 @@ s32  igb_phy_init_script_igp3(struct e1000_hw *hw);
 #define IGP02E1000_PM_D3_LPLU             0x0004 /* For all other states */
 #define IGP01E1000_PLHR_SS_DOWNGRADE      0x8000
 #define IGP01E1000_PSSR_POLARITY_REVERSED 0x0002
-#define IGP01E1000_PSSR_MDIX              0x0008
+#define IGP01E1000_PSSR_MDIX              0x0800
 #define IGP01E1000_PSSR_SPEED_MASK        0xC000
 #define IGP01E1000_PSSR_SPEED_1000MBPS    0xC000
 #define IGP02E1000_PHY_CHANNEL_NUM        4