aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChun-Hao Lin <hau@realtek.com>2016-03-11 01:21:14 -0500
committerDavid S. Miller <davem@davemloft.net>2016-03-13 22:32:44 -0400
commitc45569755e828a8458d125bb93feb1d90ac9be6f (patch)
treea7af9fc77bc1b1de032ddfa92883b88efc0129a1
parent233fa44bd67ae0c6cbc01f96ab87d66a6c57812e (diff)
r8169:Remove unnecessary phy reset for pcie nic when setting link spped.
For pcie nic, after setting link speed and there is no link driver does not need to do phy reset until link up. For some pcie nics, to do this will also reset phy speed down counter and prevent phy from auto speed down. This patch fix the issue reported in following link. https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1547151 Signed-off-by: Chunhao Lin <hau@realtek.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/realtek/r8169.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index dd2cf3738b73..94f08f1e841c 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -1999,7 +1999,8 @@ static int rtl8169_set_speed(struct net_device *dev,
1999 goto out; 1999 goto out;
2000 2000
2001 if (netif_running(dev) && (autoneg == AUTONEG_ENABLE) && 2001 if (netif_running(dev) && (autoneg == AUTONEG_ENABLE) &&
2002 (advertising & ADVERTISED_1000baseT_Full)) { 2002 (advertising & ADVERTISED_1000baseT_Full) &&
2003 !pci_is_pcie(tp->pci_dev)) {
2003 mod_timer(&tp->timer, jiffies + RTL8169_PHY_TIMEOUT); 2004 mod_timer(&tp->timer, jiffies + RTL8169_PHY_TIMEOUT);
2004 } 2005 }
2005out: 2006out: