mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
1d2590f838
Refresh patches Fixes: CVE-2017-5754 aka Meltdown Tested-on: ar71xx Archer C7 v2 Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com> [fix conflict after 4.14 bump] Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
Date: Thu, 1 Oct 2015 19:40:31 +0100
|
|
Subject: [PATCH] net: mvneta: add nway_reset support
|
|
|
|
Add ethtool nway_reset support to mvneta via phylink, so that userspace
|
|
can request the link in whatever mode to be renegotiated via
|
|
ethtool -r ethX.
|
|
|
|
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
---
|
|
|
|
--- a/drivers/net/ethernet/marvell/mvneta.c
|
|
+++ b/drivers/net/ethernet/marvell/mvneta.c
|
|
@@ -3615,6 +3615,13 @@ mvneta_ethtool_get_link_ksettings(struct
|
|
return phylink_ethtool_ksettings_get(pp->phylink, cmd);
|
|
}
|
|
|
|
+static int mvneta_ethtool_nway_reset(struct net_device *dev)
|
|
+{
|
|
+ struct mvneta_port *pp = netdev_priv(dev);
|
|
+
|
|
+ return phylink_ethtool_nway_reset(pp->phylink);
|
|
+}
|
|
+
|
|
/* Set interrupt coalescing for ethtools */
|
|
static int mvneta_ethtool_set_coalesce(struct net_device *dev,
|
|
struct ethtool_coalesce *c)
|
|
@@ -3888,6 +3895,7 @@ static const struct net_device_ops mvnet
|
|
};
|
|
|
|
const struct ethtool_ops mvneta_eth_tool_ops = {
|
|
+ .nway_reset = mvneta_ethtool_nway_reset,
|
|
.get_link = ethtool_op_get_link,
|
|
.set_coalesce = mvneta_ethtool_set_coalesce,
|
|
.get_coalesce = mvneta_ethtool_get_coalesce,
|