From: David S. Miller <davem@davemloft.net>
Date: Wed, 25 Jul 2018 02:21:58 +0000 (-0700)
Subject: Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=19725496da5602b401eae389736ab00d1817e264;p=linux.git

Merge ra./pub/scm/linux/kernel/git/davem/net
---

19725496da5602b401eae389736ab00d1817e264
diff --cc drivers/net/ethernet/realtek/r8169.c
index 49a6e25ddc2b1,eaedc11ed6867..8ea1fa36ca438
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@@ -7396,9 -7734,24 +7396,8 @@@ static int rtl_init_one(struct pci_dev 
  		return rc;
  	}
  
- 	/* override BIOS settings, use userspace tools to enable WOL */
- 	__rtl8169_set_wol(tp, 0);
+ 	tp->saved_wolopts = __rtl8169_get_wol(tp);
  
 -	if (rtl_tbi_enabled(tp)) {
 -		tp->set_speed = rtl8169_set_speed_tbi;
 -		tp->get_link_ksettings = rtl8169_get_link_ksettings_tbi;
 -		tp->phy_reset_enable = rtl8169_tbi_reset_enable;
 -		tp->phy_reset_pending = rtl8169_tbi_reset_pending;
 -		tp->link_ok = rtl8169_tbi_link_ok;
 -		tp->do_ioctl = rtl_tbi_ioctl;
 -	} else {
 -		tp->set_speed = rtl8169_set_speed_xmii;
 -		tp->get_link_ksettings = rtl8169_get_link_ksettings_xmii;
 -		tp->phy_reset_enable = rtl8169_xmii_reset_enable;
 -		tp->phy_reset_pending = rtl8169_xmii_reset_pending;
 -		tp->link_ok = rtl8169_xmii_link_ok;
 -		tp->do_ioctl = rtl_xmii_ioctl;
 -	}
 -
  	mutex_init(&tp->wk.mutex);
  	u64_stats_init(&tp->rx_stats.syncp);
  	u64_stats_init(&tp->tx_stats.syncp);