diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-04 10:31:33 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-04 10:31:33 -0400 |
| commit | 9ea92530771d660869933a4635e4b60e67ac2abc (patch) | |
| tree | e3d8db7a5bcdf67ee349777f42e0bd8b9a249454 | |
| parent | 501b48536df68cf8d9d58af9c64f33d84816aa7e (diff) | |
| download | longterm-queue-4.12-9ea92530771d660869933a4635e4b60e67ac2abc.tar.gz | |
net: rtl8169: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/net-realtek-r8169-implement-set_link_ksettings.patch | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/queue/net-realtek-r8169-implement-set_link_ksettings.patch b/queue/net-realtek-r8169-implement-set_link_ksettings.patch index 22df26f..1c92c31 100644 --- a/queue/net-realtek-r8169-implement-set_link_ksettings.patch +++ b/queue/net-realtek-r8169-implement-set_link_ksettings.patch @@ -1,4 +1,4 @@ -From 9e77d7a5549dc4d4999a60676373ab3fd1dae4db Mon Sep 17 00:00:00 2001 +From 08b6dcd769d775de84943da5f32f905884015a33 Mon Sep 17 00:00:00 2001 From: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> Date: Tue, 21 Nov 2017 16:15:57 +0100 Subject: [PATCH] net: realtek: r8169: implement set_link_ksettings() @@ -23,12 +23,13 @@ Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> Tested-by: Holger Hoffstätte <holger@applied-asynchrony.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c -index 2cb3622c4acc..fc0d5fa65ad4 100644 +index 0a8f2817ea60..c718313f9e4d 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c -@@ -2030,21 +2030,6 @@ out: +@@ -2025,21 +2025,6 @@ static int rtl8169_set_speed(struct net_device *dev, return ret; } @@ -50,7 +51,7 @@ index 2cb3622c4acc..fc0d5fa65ad4 100644 static netdev_features_t rtl8169_fix_features(struct net_device *dev, netdev_features_t features) { -@@ -2171,6 +2156,27 @@ static int rtl8169_get_link_ksettings(struct net_device *dev, +@@ -2164,6 +2149,27 @@ static int rtl8169_get_link_ksettings(struct net_device *dev, return rc; } @@ -78,15 +79,15 @@ index 2cb3622c4acc..fc0d5fa65ad4 100644 static void rtl8169_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p) { -@@ -2591,7 +2597,6 @@ static const struct ethtool_ops rtl8169_ethtool_ops = { +@@ -2365,7 +2371,6 @@ static const struct ethtool_ops rtl8169_ethtool_ops = { + .get_drvinfo = rtl8169_get_drvinfo, + .get_regs_len = rtl8169_get_regs_len, .get_link = ethtool_op_get_link, - .get_coalesce = rtl_get_coalesce, - .set_coalesce = rtl_set_coalesce, - .set_settings = rtl8169_set_settings, .get_msglevel = rtl8169_get_msglevel, .set_msglevel = rtl8169_set_msglevel, .get_regs = rtl8169_get_regs, -@@ -2603,6 +2608,7 @@ static const struct ethtool_ops rtl8169_ethtool_ops = { +@@ -2377,6 +2382,7 @@ static const struct ethtool_ops rtl8169_ethtool_ops = { .get_ts_info = ethtool_op_get_ts_info, .nway_reset = rtl8169_nway_reset, .get_link_ksettings = rtl8169_get_link_ksettings, |