mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
7bc25dfa63
Kernel 4.4.109 added pp->link, pp->duplex and pp->speed setters to
mvneta_port_disable() which the mvneta patchset failed to patch out after
rebasing, leading to the following build error:
CC drivers/net/ethernet/marvell/mvneta.o
drivers/net/ethernet/marvell/mvneta.c: In function 'mvneta_port_disable':
drivers/net/ethernet/marvell/mvneta.c:1199:4: error: 'struct mvneta_port' has no member named 'link'
pp->link = 0;
^
drivers/net/ethernet/marvell/mvneta.c:1200:4: error: 'struct mvneta_port' has no member named 'duplex'
pp->duplex = -1;
^
drivers/net/ethernet/marvell/mvneta.c:1201:4: error: 'struct mvneta_port' has no member named 'speed'
pp->speed = 0;
^
Fix the issue by rebasing 134-net-mvneta-convert-to-phylink.patch to remove
these struct member accesses as well.
Fixes: 7f5a040359 ("kernel: update kernel 4.4 to version 4.4.110")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From 244bee2889d08f876c64c335765a8ea6de0f5381 Mon Sep 17 00:00:00 2001
|
|
From: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
Date: Thu, 1 Oct 2015 19:40:31 +0100
|
|
Subject: [PATCH 725/744] 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>
|
|
---
|
|
drivers/net/ethernet/marvell/mvneta.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
--- a/drivers/net/ethernet/marvell/mvneta.c
|
|
+++ b/drivers/net/ethernet/marvell/mvneta.c
|
|
@@ -3589,6 +3589,13 @@ int mvneta_ethtool_set_settings(struct n
|
|
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)
|
|
@@ -3853,6 +3860,7 @@ const struct ethtool_ops mvneta_eth_tool
|
|
.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,
|