diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2009-09-14 04:22:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-14 20:03:49 -0400 |
| commit | 2fb02a26bda1cbc3553164a8358c303d936255c5 (patch) | |
| tree | edbe01441d2136b6a3f9a07e374cb9850cf6d751 /drivers/net/igb/igb_main.c | |
| parent | 6b1be1990d2f7d1a3b1f25bf3e6444600665764a (diff) | |
igb: reset sgmii phy at start of init
Our SGMII phy code was incomplete in that it was not actually placing the
phy in SGMII mode and as a result the PHY was not able to establish a link
when connected to a non serdes link partner. This patch updates the code
to combine the SGMII/serdes PCS init and to add the necessary reset.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/igb/igb_main.c')
| -rw-r--r-- | drivers/net/igb/igb_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 943186b7848..d2639c4a086 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
| @@ -5320,7 +5320,7 @@ static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake) | |||
| 5320 | 5320 | ||
| 5321 | *enable_wake = wufc || adapter->en_mng_pt; | 5321 | *enable_wake = wufc || adapter->en_mng_pt; |
| 5322 | if (!*enable_wake) | 5322 | if (!*enable_wake) |
| 5323 | igb_shutdown_fiber_serdes_link_82575(hw); | 5323 | igb_shutdown_serdes_link_82575(hw); |
| 5324 | 5324 | ||
| 5325 | /* Release control of h/w to f/w. If f/w is AMT enabled, this | 5325 | /* Release control of h/w to f/w. If f/w is AMT enabled, this |
| 5326 | * would have already happened in close and is redundant. */ | 5326 | * would have already happened in close and is redundant. */ |