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/139-net-mvneta-add-flow-control-support-via-phylink.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/139-net-mvneta-add-flow-control-support-via-phylink.patch')
| -rw-r--r-- | target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.patch b/target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.patch index 328dd0e18d..75cd46e3da 100644 --- a/target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.patch +++ b/target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.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 -@@ -3212,6 +3212,8 @@ static void mvneta_mac_config(struct net +@@ -3208,6 +3208,8 @@ static void mvneta_mac_config(struct net if (state->advertising & ADVERTISED_Pause) new_an |= MVNETA_GMAC_ADVERT_SYM_FLOW_CTRL; @@ -23,7 +23,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> switch (mode) { case MLO_AN_SGMII: -@@ -3236,7 +3238,7 @@ static void mvneta_mac_config(struct net +@@ -3232,7 +3234,7 @@ static void mvneta_mac_config(struct net /* The MAC only supports FD mode */ MVNETA_GMAC_CONFIG_FULL_DUPLEX; @@ -32,7 +32,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> new_an |= MVNETA_GMAC_AN_FLOW_CTRL_EN; break; -@@ -3689,6 +3691,22 @@ static int mvneta_ethtool_set_ringparam( +@@ -3685,6 +3687,22 @@ static int mvneta_ethtool_set_ringparam( return 0; } @@ -55,7 +55,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> static void mvneta_ethtool_get_strings(struct net_device *netdev, u32 sset, u8 *data) { -@@ -3870,6 +3888,8 @@ const struct ethtool_ops mvneta_eth_tool +@@ -3866,6 +3884,8 @@ const struct ethtool_ops mvneta_eth_tool .get_drvinfo = mvneta_ethtool_get_drvinfo, .get_ringparam = mvneta_ethtool_get_ringparam, .set_ringparam = mvneta_ethtool_set_ringparam, |