diff options
| author |   Chun-Hao Lin <hau@realtek.com> | 2016-03-11 14:21:14 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-03-13 22:32:44 -0400 |
| commit | c45569755e828a8458d125bb93feb1d90ac9be6f (patch) | |
| tree | a7af9fc77bc1b1de032ddfa92883b88efc0129a1 /drivers/net/ethernet/realtek | |
| parent | mlxsw: pci: Implement reset done check (diff) | |
| download | linux-dev-c45569755e828a8458d125bb93feb1d90ac9be6f.tar.xz linux-dev-c45569755e828a8458d125bb93feb1d90ac9be6f.zip | |
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/net/ethernet/realtek')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 3 |
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, 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: |