mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-23 07:11:26 +00:00
baab6587a5
Rename LINUXFAMILY: marvell to mvebu Replace default kernel with 4.4.x branch from dev configuration
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
From: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
Subject: [PATCH 19/30] net: mvneta: add nway_reset support
|
|
MIME-Version: 1.0
|
|
Content-Disposition: inline
|
|
Content-Transfer-Encoding: 8bit
|
|
Content-Type: text/plain; charset="utf-8"
|
|
|
|
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>
|
|
---
|
|
drivers/net/ethernet/marvell/mvneta.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
|
|
index f19d9a31dccd..82aa2b59a249 100644
|
|
--- a/drivers/net/ethernet/marvell/mvneta.c
|
|
+++ b/drivers/net/ethernet/marvell/mvneta.c
|
|
@@ -3020,6 +3020,13 @@ int mvneta_ethtool_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
|
|
return phylink_ethtool_set_settings(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)
|
|
@@ -3184,6 +3191,7 @@ const struct ethtool_ops mvneta_eth_tool_ops = {
|
|
.get_link = ethtool_op_get_link,
|
|
.get_settings = mvneta_ethtool_get_settings,
|
|
.set_settings = mvneta_ethtool_set_settings,
|
|
+ .nway_reset = mvneta_ethtool_nway_reset,
|
|
.set_coalesce = mvneta_ethtool_set_coalesce,
|
|
.get_coalesce = mvneta_ethtool_get_coalesce,
|
|
.get_drvinfo = mvneta_ethtool_get_drvinfo,
|
|
--
|
|
2.1.0
|
|
|