mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 22:47:56 +00:00
239dff6697
The lantiq patch 0028-NET-lantiq-various-etop-fixes.patch and sunxi
patch 0051-stmmac-form-4-11.patch no longer applied after applying the
the "generalize napi_complete_done()" patch.
Update them so they apply, and refresh patches while at it.
Fixes: 9aeb7ce8dc ("generic: net: generalize napi_complete_done")
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
|
|
@@ -3614,6 +3614,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)
|
|
@@ -3887,6 +3894,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,
|