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>
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From 665e1fe77dedcfc6b5669214ebfd252c803290d4 Mon Sep 17 00:00:00 2001
|
|
From: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
Date: Thu, 1 Oct 2015 23:32:39 +0100
|
|
Subject: [PATCH 733/744] net: mvneta: add module EEPROM reading support
|
|
|
|
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
---
|
|
drivers/net/ethernet/marvell/mvneta.c | 18 ++++++++++++++++++
|
|
1 file changed, 18 insertions(+)
|
|
|
|
--- a/drivers/net/ethernet/marvell/mvneta.c
|
|
+++ b/drivers/net/ethernet/marvell/mvneta.c
|
|
@@ -3911,6 +3911,22 @@ static int mvneta_ethtool_get_rxfh(struc
|
|
return 0;
|
|
}
|
|
|
|
+static int mvneta_ethtool_get_module_info(struct net_device *dev,
|
|
+ struct ethtool_modinfo *modinfo)
|
|
+{
|
|
+ struct mvneta_port *pp = netdev_priv(dev);
|
|
+
|
|
+ return phylink_ethtool_get_module_info(pp->phylink, modinfo);
|
|
+}
|
|
+
|
|
+static int mvneta_ethtool_get_module_eeprom(struct net_device *dev,
|
|
+ struct ethtool_eeprom *ee, u8 *buf)
|
|
+{
|
|
+ struct mvneta_port *pp = netdev_priv(dev);
|
|
+
|
|
+ return phylink_ethtool_get_module_eeprom(pp->phylink, ee, buf);
|
|
+}
|
|
+
|
|
static int mvneta_ethtool_get_eee(struct net_device *dev,
|
|
struct ethtool_eee *eee)
|
|
{
|
|
@@ -3983,6 +3999,8 @@ const struct ethtool_ops mvneta_eth_tool
|
|
.get_rxnfc = mvneta_ethtool_get_rxnfc,
|
|
.get_rxfh = mvneta_ethtool_get_rxfh,
|
|
.set_rxfh = mvneta_ethtool_set_rxfh,
|
|
+ .get_module_info = mvneta_ethtool_get_module_info,
|
|
+ .get_module_eeprom = mvneta_ethtool_get_module_eeprom,
|
|
.get_eee = mvneta_ethtool_get_eee,
|
|
.set_eee = mvneta_ethtool_set_eee,
|
|
};
|