mvebu: next backport mvnet MQPrio offload

[openwrt/openwrt.git] / target / linux / mvebu / patches-5.10 / 703-net-next-ethernet-marvell-mvnetaMQPrioFlag.patch

diff --git a/target/linux/mvebu/patches-5.10/703-net-next-ethernet-marvell-mvnetaMQPrioFlag.patch b/target/linux/mvebu/patches-5.10/703-net-next-ethernet-marvell-mvnetaMQPrioFlag.patch
new file mode 100644 (file)
index 0000000..a9bf9b2
--- /dev/null
+++ b/target/linux/mvebu/patches-5.10/703-net-next-ethernet-marvell-mvnetaMQPrioFlag.patch
@@ -0,0 +1,35 @@
+From e7ca75fe6662f78bfeb0112671c812e4c7b8e214 Mon Sep 17 00:00:00 2001
+From: Maxime Chevallier <maxime.chevallier@bootlin.com>
+Date: Fri, 26 Nov 2021 12:20:54 +0100
+Subject: net: mvneta: Don't force-set the offloading flag
+
+The qopt->hw flag is set by the TC code according to the offloading mode
+asked by user. Don't force-set it in the driver, but instead read it to
+make sure we do what's asked.
+
+Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/ethernet/marvell/mvneta.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+(limited to 'drivers/net/ethernet/marvell/mvneta.c')
+
+diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
+index 46b7604805f76..d3ce87e69d2a8 100644
+--- a/drivers/net/ethernet/marvell/mvneta.c
++++ b/drivers/net/ethernet/marvell/mvneta.c
+@@ -4915,7 +4915,9 @@ static int mvneta_setup_mqprio(struct net_device *dev,
+       u8 num_tc;
+       int i;
+ 
+-      mqprio->qopt.hw = TC_MQPRIO_HW_OFFLOAD_TCS;
++      if (mqprio->qopt.hw != TC_MQPRIO_HW_OFFLOAD_TCS)
++              return 0;
++
+       num_tc = mqprio->qopt.num_tc;
+ 
+       if (num_tc > rxq_number)
+-- 
+cgit 1.2.3-1.el7
+