[][MAC80211][hnat][Fix unbind issue for ADMAv1]
[Description]
Fix unbind issue for ADMAv1.
Refactor internal patches since ADMA hardware version have been
reverted to the v1.
[Release-log]
N/A
Change-Id: Ie3012c3b643c82ff9ec0aa6d2af0ce77925e462e
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/7248833
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9994-ethernet-update-ppe-from-mt7622-to-mt7986.patch b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9994-ethernet-update-ppe-from-mt7622-to-mt7986.patch
index 8deac02..033f588 100755
--- a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9994-ethernet-update-ppe-from-mt7622-to-mt7986.patch
+++ b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9994-ethernet-update-ppe-from-mt7622-to-mt7986.patch
@@ -22,7 +22,7 @@
skb->protocol = eth_type_trans(skb, netdev);
- hash = trxd.rxd4 & MTK_RXD4_FOE_ENTRY;
-+#if defined(CONFIG_MEDIATEK_NETSYS_V2)
++#if defined(CONFIG_MEDIATEK_NETSYS_RX_V2)
+ hash = trxd.rxd5 & MTK_RXD5_FOE_ENTRY_V2;
+#else
+ hash = trxd.rxd4 & MTK_RXD4_FOE_ENTRY;
@@ -32,7 +32,7 @@
skb_set_hash(skb, hash, PKT_HASH_TYPE_L4);
}
-+#if defined(CONFIG_MEDIATEK_NETSYS_V2)
++#if defined(CONFIG_MEDIATEK_NETSYS_RX_V2)
+ reason = FIELD_GET(MTK_RXD5_PPE_CPU_REASON_V2, trxd.rxd5);
+ if (reason == MTK_PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED)
+ mtk_ppe_check_skb(eth->ppe, skb,
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9995-flow-offload-add-mkhnat-dual-ppe-new-v2.patch b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9995-flow-offload-add-mkhnat-dual-ppe-new-v2.patch
index 850afe4..5d6f0d1 100755
--- a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9995-flow-offload-add-mkhnat-dual-ppe-new-v2.patch
+++ b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9995-flow-offload-add-mkhnat-dual-ppe-new-v2.patch
@@ -41,7 +41,7 @@
goto rx_done;
@@ -1843,14 +1844,20 @@ static int mtk_poll_rx(struct napi_struc
- #if defined(CONFIG_MEDIATEK_NETSYS_V2)
+ #if defined(CONFIG_MEDIATEK_NETSYS_RX_V2)
reason = FIELD_GET(MTK_RXD5_PPE_CPU_REASON_V2, trxd.rxd5);
- if (reason == MTK_PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED)
- mtk_ppe_check_skb(eth->ppe, skb,
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9999-6-ethernet-update-ppe-from-mt7986-to-mt7988.patch b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9999-6-ethernet-update-ppe-from-mt7986-to-mt7988.patch
index 1a13d74..aac0808 100644
--- a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9999-6-ethernet-update-ppe-from-mt7986-to-mt7988.patch
+++ b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9999-6-ethernet-update-ppe-from-mt7986-to-mt7988.patch
@@ -6,9 +6,9 @@
skb_checksum_none_assert(skb);
skb->protocol = eth_type_trans(skb, netdev);
--#if defined(CONFIG_MEDIATEK_NETSYS_V2)
+-#if defined(CONFIG_MEDIATEK_NETSYS_RX_V2)
- hash = trxd.rxd5 & MTK_RXD5_FOE_ENTRY_V2;
-+#if defined(CONFIG_MEDIATEK_NETSYS_V2) || defined(CONFIG_MEDIATEK_NETSYS_V3)
++#if defined(CONFIG_MEDIATEK_NETSYS_RX_V2) || defined(CONFIG_MEDIATEK_NETSYS_V3)
+ hash = trxd.rxd5 & MTK_RXD5_FOE_ENTRY_V2;
#else
- hash = trxd.rxd4 & MTK_RXD4_FOE_ENTRY;
@@ -19,8 +19,8 @@
skb_set_hash(skb, hash, PKT_HASH_TYPE_L4);
}
--#if defined(CONFIG_MEDIATEK_NETSYS_V2)
-+#if defined(CONFIG_MEDIATEK_NETSYS_V2) || defined(CONFIG_MEDIATEK_NETSYS_V3)
+-#if defined(CONFIG_MEDIATEK_NETSYS_RX_V2)
++#if defined(CONFIG_MEDIATEK_NETSYS_RX_V2) || defined(CONFIG_MEDIATEK_NETSYS_V3)
reason = FIELD_GET(MTK_RXD5_PPE_CPU_REASON_V2, trxd.rxd5);
if (reason == MTK_PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED) {
for (i = 0; i < eth->ppe_num; i++) {