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/400-mvneta-tx-queue-workaround.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/400-mvneta-tx-queue-workaround.patch')
-rw-r--r-- | target/linux/mvebu/patches-4.4/400-mvneta-tx-queue-workaround.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mvebu/patches-4.4/400-mvneta-tx-queue-workaround.patch b/target/linux/mvebu/patches-4.4/400-mvneta-tx-queue-workaround.patch index a0627309c2..5dba311d93 100644 --- a/target/linux/mvebu/patches-4.4/400-mvneta-tx-queue-workaround.patch +++ b/target/linux/mvebu/patches-4.4/400-mvneta-tx-queue-workaround.patch @@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c -@@ -3988,6 +3988,16 @@ static int mvneta_ethtool_set_eee(struct +@@ -3984,6 +3984,16 @@ static int mvneta_ethtool_set_eee(struct return phylink_ethtool_set_eee(pp->phylink, eee); } @@ -26,7 +26,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> static const struct net_device_ops mvneta_netdev_ops = { .ndo_open = mvneta_open, .ndo_stop = mvneta_stop, -@@ -3998,6 +4008,7 @@ static const struct net_device_ops mvnet +@@ -3994,6 +4004,7 @@ static const struct net_device_ops mvnet .ndo_fix_features = mvneta_fix_features, .ndo_get_stats64 = mvneta_get_stats64, .ndo_do_ioctl = mvneta_ioctl, |