mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-11-01 07:28:49 +00:00
d62ecd6c07
Refresh patches 6.12 for airoha and econet Fixes:122135b964("airoha: an7581: add support for kernel 6.12") Fixes:73d0f92460("kernel: Add new platform EcoNet MIPS") Signed-off-by: Leo Barsky <leobrsky@proton.me> Link: https://github.com/openwrt/openwrt/pull/20073 Signed-off-by: Robert Marko <robimarko@gmail.com>
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From 7d0da8f862340c5f42f0062b8560b8d0971a6ac4 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Tue, 7 Jan 2025 23:26:28 +0100
|
|
Subject: [PATCH] net: airoha: Fix channel configuration for ETS Qdisc
|
|
|
|
Limit ETS QoS channel to AIROHA_NUM_QOS_CHANNELS in
|
|
airoha_tc_setup_qdisc_ets() in order to align the configured channel to
|
|
the value set in airoha_dev_select_queue().
|
|
|
|
Fixes: 20bf7d07c956 ("net: airoha: Add sched ETS offload support")
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
|
|
Link: https://patch.msgid.link/20250107-airoha-ets-fix-chan-v1-1-97f66ed3a068@kernel.org
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_eth.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
|
|
@@ -2183,11 +2183,14 @@ static int airoha_qdma_get_tx_ets_stats(
|
|
static int airoha_tc_setup_qdisc_ets(struct airoha_gdm_port *port,
|
|
struct tc_ets_qopt_offload *opt)
|
|
{
|
|
- int channel = TC_H_MAJ(opt->handle) >> 16;
|
|
+ int channel;
|
|
|
|
if (opt->parent == TC_H_ROOT)
|
|
return -EINVAL;
|
|
|
|
+ channel = TC_H_MAJ(opt->handle) >> 16;
|
|
+ channel = channel % AIROHA_NUM_QOS_CHANNELS;
|
|
+
|
|
switch (opt->command) {
|
|
case TC_ETS_REPLACE:
|
|
return airoha_qdma_set_tx_ets_sched(port, channel, opt);
|