summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorChun-Hao Lin <hau@realtek.com>2016-03-11 06:21:14 (GMT)
committerDavid S. Miller <davem@davemloft.net>2016-03-14 02:32:44 (GMT)
commitc45569755e828a8458d125bb93feb1d90ac9be6f (patch)
treea7af9fc77bc1b1de032ddfa92883b88efc0129a1 /drivers
parent233fa44bd67ae0c6cbc01f96ab87d66a6c57812e (diff)
downloadlinux-c45569755e828a8458d125bb93feb1d90ac9be6f.tar.xz
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>
Diffstat (limited to 'drivers')
-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 dd2cf37..94f08f1 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,
goto out;
if (netif_running(dev) && (autoneg == AUTONEG_ENABLE) &&
- (advertising & ADVERTISED_1000baseT_Full)) {
+ (advertising & ADVERTISED_1000baseT_Full) &&
+ !pci_is_pcie(tp->pci_dev)) {
mod_timer(&tp->timer, jiffies + RTL8169_PHY_TIMEOUT);
}
out: