mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-09 14:33:00 +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>
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
The hardware queue scheduling is apparently configured with fixed
|
|
priorities, which creates a nasty fairness issue where traffic from one
|
|
CPU can starve traffic from all other CPUs.
|
|
|
|
Work around this issue by forcing all tx packets to go through one CPU,
|
|
until this issue is fixed properly.
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
--- a/drivers/net/ethernet/marvell/mvneta.c
|
|
+++ b/drivers/net/ethernet/marvell/mvneta.c
|
|
@@ -3984,6 +3984,16 @@ static int mvneta_ethtool_set_eee(struct
|
|
return phylink_ethtool_set_eee(pp->phylink, eee);
|
|
}
|
|
|
|
+static u16 mvneta_select_queue(struct net_device *dev, struct sk_buff *skb,
|
|
+ void *accel_priv,
|
|
+ select_queue_fallback_t fallback)
|
|
+{
|
|
+ /* XXX: hardware queue scheduling is broken,
|
|
+ * use only one queue until it is fixed */
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+
|
|
static const struct net_device_ops mvneta_netdev_ops = {
|
|
.ndo_open = mvneta_open,
|
|
.ndo_stop = mvneta_stop,
|
|
@@ -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,
|
|
+ .ndo_select_queue = mvneta_select_queue,
|
|
};
|
|
|
|
const struct ethtool_ops mvneta_eth_tool_ops = {
|