mvebu: switch to kernel 6.1
[openwrt/staging/jow.git] / target / linux / mvebu / patches-5.15 / 703-net-next-ethernet-marvell-mvnetaMQPrioFlag.patch
1 From e7ca75fe6662f78bfeb0112671c812e4c7b8e214 Mon Sep 17 00:00:00 2001
2 From: Maxime Chevallier <maxime.chevallier@bootlin.com>
3 Date: Fri, 26 Nov 2021 12:20:54 +0100
4 Subject: net: mvneta: Don't force-set the offloading flag
5
6 The qopt->hw flag is set by the TC code according to the offloading mode
7 asked by user. Don't force-set it in the driver, but instead read it to
8 make sure we do what's asked.
9
10 Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
11 Signed-off-by: David S. Miller <davem@davemloft.net>
12 ---
13 drivers/net/ethernet/marvell/mvneta.c | 4 +++-
14 1 file changed, 3 insertions(+), 1 deletion(-)
15
16 (limited to 'drivers/net/ethernet/marvell/mvneta.c')
17
18 --- a/drivers/net/ethernet/marvell/mvneta.c
19 +++ b/drivers/net/ethernet/marvell/mvneta.c
20 @@ -4973,7 +4973,9 @@ static int mvneta_setup_mqprio(struct ne
21 u8 num_tc;
22 int i;
23
24 - mqprio->qopt.hw = TC_MQPRIO_HW_OFFLOAD_TCS;
25 + if (mqprio->qopt.hw != TC_MQPRIO_HW_OFFLOAD_TCS)
26 + return 0;
27 +
28 num_tc = mqprio->qopt.num_tc;
29
30 if (num_tc > rxq_number)