diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2009-12-23 13:20:47 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-23 20:47:49 -0800 |
| commit | d68caec645b4b92f6a81985265b024bc94bce41f (patch) | |
| tree | a9c3a921840e67e591b578f118edb5ddf81567b8 /drivers/net/igb | |
| parent | 286d47ba90315a871f77351f7f61b7e4a96476a9 (diff) | |
| download | op-kernel-dev-d68caec645b4b92f6a81985265b024bc94bce41f.zip op-kernel-dev-d68caec645b4b92f6a81985265b024bc94bce41f.tar.gz | |
igb: do not force pcs link when in KX mode
We were forcing the PCS link up in error when we are in KX mode. We should
only be disabling autoneg, not forcing the link up.
Signed-off-by: Alexander Duyck <alexander.h.duyck@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/igb')
| -rw-r--r-- | drivers/net/igb/e1000_82575.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c index e8e9e91..c505b50d 100644 --- a/drivers/net/igb/e1000_82575.c +++ b/drivers/net/igb/e1000_82575.c @@ -1096,9 +1096,7 @@ static s32 igb_setup_serdes_link_82575(struct e1000_hw *hw) hw_dbg("Configuring Autoneg:PCS_LCTL=0x%08X\n", reg); } else { /* Set PCS register for forced link */ - reg |= E1000_PCS_LCTL_FSD | /* Force Speed */ - E1000_PCS_LCTL_FORCE_LINK | /* Force Link */ - E1000_PCS_LCTL_FLV_LINK_UP; /* Force link value up */ + reg |= E1000_PCS_LCTL_FSD; /* Force Speed */ hw_dbg("Configuring Forced Link:PCS_LCTL=0x%08X\n", reg); } |
