diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2018-01-08 14:35:21 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-01-08 14:35:21 +0100 |
| commit | 7bc25dfa63c084298edcc8bf5c5cdf258229d24a (patch) | |
| tree | 1ad69f451028e3b39c5b0412f92cff19216b961a /target/linux/mvebu/patches-4.4/137-net-mvneta-add-nway_reset-support.patch | |
| parent | 541a1a7ff5ce9ef7a5660e483635ecd0892137dc (diff) | |
| download | upstream-7bc25dfa63c084298edcc8bf5c5cdf258229d24a.tar.gz upstream-7bc25dfa63c084298edcc8bf5c5cdf258229d24a.tar.bz2 upstream-7bc25dfa63c084298edcc8bf5c5cdf258229d24a.zip | |
mvebu: fix mvneta build with Linux 4.4.110
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>
Diffstat (limited to 'target/linux/mvebu/patches-4.4/137-net-mvneta-add-nway_reset-support.patch')
| -rw-r--r-- | target/linux/mvebu/patches-4.4/137-net-mvneta-add-nway_reset-support.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mvebu/patches-4.4/137-net-mvneta-add-nway_reset-support.patch b/target/linux/mvebu/patches-4.4/137-net-mvneta-add-nway_reset-support.patch index b2f0ed5da5..034b596436 100644 --- a/target/linux/mvebu/patches-4.4/137-net-mvneta-add-nway_reset-support.patch +++ b/target/linux/mvebu/patches-4.4/137-net-mvneta-add-nway_reset-support.patch @@ -14,7 +14,7 @@ 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 -@@ -3593,6 +3593,13 @@ int mvneta_ethtool_set_settings(struct n +@@ -3589,6 +3589,13 @@ int mvneta_ethtool_set_settings(struct n return phylink_ethtool_set_settings(pp->phylink, cmd); } @@ -28,7 +28,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> /* Set interrupt coalescing for ethtools */ static int mvneta_ethtool_set_coalesce(struct net_device *dev, struct ethtool_coalesce *c) -@@ -3857,6 +3864,7 @@ const struct ethtool_ops mvneta_eth_tool +@@ -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, |