From 84ea65a6d1c2bc9bc28e8f54df5766395ea9ce05 Mon Sep 17 00:00:00 2001 From: Corcodel Marian Date: Mon, 6 Jul 2015 16:33:18 +0300 Subject: [net-next Disable setting speed outside the ethtool] Committer: Corcodel Marian To: netdev@vger.kernel.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------mine-boundary-string" This is a multi-part message in MIME format. --------------mine-boundary-string Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: 8bit On branch master Your branch is ahead of 'origin/master' by 1 commit. (use "git push" to publish your local commits) Disable setting speed outside ethtool Changes to be committed: modified: drivers/net/ethernet/realtek/r8169.c Signed-off-by: Corcodel Marian --- drivers/net/ethernet/realtek/r8169.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --------------mine-boundary-string Content-Type: text/x-patch; name="0001-Committer-Corcodel-Marian-asu-192-168-0-3.rdsnet.ro.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0001-Committer-Corcodel-Marian-asu-192-168-0-3.rdsnet.ro.patch" diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 840a2ec..9189da3 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -4353,12 +4353,12 @@ static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp) rtl8169_phy_reset(dev, tp); - rtl8169_set_speed(dev, AUTONEG_ENABLE, SPEED_1000, DUPLEX_FULL, + /* rtl8169_set_speed(dev, AUTONEG_ENABLE, SPEED_1000, DUPLEX_FULL, ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full | ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full | (tp->mii.supports_gmii ? ADVERTISED_1000baseT_Half | - ADVERTISED_1000baseT_Full : 0)); + ADVERTISED_1000baseT_Full : 0)); */ if (rtl_tbi_enabled(tp)) netif_info(tp, link, dev, "TBI auto-negotiating\n"); @@ -4541,7 +4541,7 @@ static bool rtl_wol_pll_power_down(struct rtl8169_private *tp) if (!(__rtl8169_get_wol(tp) & WAKE_ANY)) return false; - rtl_speed_down(tp); + //rtl_speed_down(tp); rtl_wol_suspend_quirk(tp); return true; --------------mine-boundary-string--