[][MAC80211][hnat][Fix dscp info didn't fill in ib2 on wifi tx path]
[Description]
Fix dscp info didn't fill in ib2 on wifi tx path
[Release-log]
Change-Id: Id9a5bcf7c8f4b16f8408b44290020fb06070a600
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/9272066
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3017-flow-offload-add-mtkhnat-dscp.patch b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3017-flow-offload-add-mtkhnat-dscp.patch
index bde5f37..d3ca5a8 100644
--- a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3017-flow-offload-add-mtkhnat-dscp.patch
+++ b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3017-flow-offload-add-mtkhnat-dscp.patch
@@ -1,4 +1,4 @@
-From 6c2db9f4385e9eff9667cd41ad4a1b2cd45f030b Mon Sep 17 00:00:00 2001
+From 43ce2ffe89e93f6bcbfa4a512744b14a8b522ac3 Mon Sep 17 00:00:00 2001
From: Bc-bocun Chen <bc-bocun.chen@mediatek.com>
Date: Mon, 18 Sep 2023 11:17:24 +0800
Subject: [PATCH] flow-offload-add-mtkhnat-dscp
@@ -47,7 +47,7 @@
int mtk_foe_entry_set_sp(struct mtk_ppe *ppe, struct mtk_foe_entry *entry);
int mtk_foe_entry_commit(struct mtk_ppe *ppe, struct mtk_flow_entry *entry);
diff --git a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
-index c1cce76..f362771 100644
+index c1cce76..b9983d7 100644
--- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
+++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
@@ -186,7 +186,7 @@ mtk_flow_get_dsa_port(struct net_device **dev)
@@ -59,15 +59,15 @@
{
struct mtk_wdma_info info = {};
int pse_port, dsa_port;
-@@ -207,6 +207,8 @@ mtk_flow_set_output_device(struct mtk_eth *eth, struct mtk_foe_entry *foe,
- goto out;
- }
+@@ -224,6 +224,8 @@ mtk_flow_set_output_device(struct mtk_eth *eth, struct mtk_foe_entry *foe,
+ return -EOPNOTSUPP;
+ out:
+ mtk_foe_entry_set_dscp(foe, dscp);
+
- dsa_port = mtk_flow_get_dsa_port(&dev);
- if (dsa_port >= 0)
- mtk_foe_entry_set_dsa(foe, dsa_port);
+ if (eth->qos_toggle == 1 || (ct->mark & MTK_QDMA_TX_MASK) >= 6) {
+ u8 qos_ul_toggle;
+
@@ -262,6 +264,7 @@ mtk_flow_offload_replace(struct mtk_eth *eth, struct flow_cls_offload *f)
int wed_index = -1;
u16 addr_type = 0;