aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/igb/igb_main.c
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2009-09-14 08:22:54 +0000
committerDavid S. Miller <davem@davemloft.net>2009-09-14 17:03:49 -0700
commit2fb02a26bda1cbc3553164a8358c303d936255c5 (patch)
treeedbe01441d2136b6a3f9a07e374cb9850cf6d751 /drivers/net/igb/igb_main.c
parent6b1be1990d2f7d1a3b1f25bf3e6444600665764a (diff)
downloadkernel_samsung_smdk4412-2fb02a26bda1cbc3553164a8358c303d936255c5.zip
kernel_samsung_smdk4412-2fb02a26bda1cbc3553164a8358c303d936255c5.tar.gz
kernel_samsung_smdk4412-2fb02a26bda1cbc3553164a8358c303d936255c5.tar.bz2
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 943186b..d2639c4 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)
*enable_wake = wufc || adapter->en_mng_pt;
if (!*enable_wake)
- igb_shutdown_fiber_serdes_link_82575(hw);
+ igb_shutdown_serdes_link_82575(hw);
/* Release control of h/w to f/w. If f/w is AMT enabled, this
* would have already happened in close and is redundant. */