mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-27 09:11:49 +00:00
baab6587a5
Rename LINUXFAMILY: marvell to mvebu Replace default kernel with 4.4.x branch from dev configuration
56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
From: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
Subject: [PATCH 18/30] phylink: add ethtool 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 phylink, to allow userspace to
|
|
request a re-negotiation of the link.
|
|
|
|
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
---
|
|
drivers/net/phy/phylink.c | 14 ++++++++++++++
|
|
include/linux/phylink.h | 1 +
|
|
2 files changed, 15 insertions(+)
|
|
|
|
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
|
|
index 7d56e5895087..908235fb16c1 100644
|
|
--- a/drivers/net/phy/phylink.c
|
|
+++ b/drivers/net/phy/phylink.c
|
|
@@ -659,6 +659,20 @@ int phylink_ethtool_set_settings(struct phylink *pl, struct ethtool_cmd *cmd)
|
|
}
|
|
EXPORT_SYMBOL_GPL(phylink_ethtool_set_settings);
|
|
|
|
+int phylink_ethtool_nway_reset(struct phylink *pl)
|
|
+{
|
|
+ int ret = 0;
|
|
+
|
|
+ mutex_lock(&pl->config_mutex);
|
|
+ if (pl->phydev)
|
|
+ ret = genphy_restart_aneg(pl->phydev);
|
|
+ pl->ops->mac_an_restart(pl->netdev, pl->link_an_mode);
|
|
+ mutex_unlock(&pl->config_mutex);
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(phylink_ethtool_nway_reset);
|
|
+
|
|
/* This emulates MII registers for a fixed-mode phy operating as per the
|
|
* passed in state. "aneg" defines if we report negotiation is possible.
|
|
*
|
|
diff --git a/include/linux/phylink.h b/include/linux/phylink.h
|
|
index c7a665a538c1..ad3c85508d19 100644
|
|
--- a/include/linux/phylink.h
|
|
+++ b/include/linux/phylink.h
|
|
@@ -65,6 +65,7 @@ void phylink_stop(struct phylink *);
|
|
|
|
int phylink_ethtool_get_settings(struct phylink *, struct ethtool_cmd *);
|
|
int phylink_ethtool_set_settings(struct phylink *, struct ethtool_cmd *);
|
|
+int phylink_ethtool_nway_reset(struct phylink *);
|
|
int phylink_mii_ioctl(struct phylink *, struct ifreq *, int);
|
|
|
|
void phylink_set_link_port(struct phylink *pl, u32 support, u8 port);
|
|
--
|
|
2.1.0
|
|
|