From 2f9461df3d414da4031d5ee50551ccbbf8ea5356 Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
Date: Thu, 6 Mar 2025 13:38:27 +0100
Subject: [PATCH] openwrt: remove mt76 patch

From testing the previous behavior of ghost-acks could not be reproduced
anymore.

Signed-off-by: David Bauer <mail@david-bauer.net>
---
 ...ake-up-calls-Android-bug-workaround.patch} |  0
 ...mt76-include-fixes-for-MT7603-MT7612.patch | 90 -------------------
 ...arning-for-missing-rate-information.patch} |  0
 ...e-incompatible-basic-rates-for-mesh.patch} |  0
 ...ce-backwards-compatible-basic-rates.patch} |  0
 5 files changed, 90 deletions(-)
 rename patches/openwrt/{0005-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch => 0004-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch} (100%)
 delete mode 100644 patches/openwrt/0004-mt76-include-fixes-for-MT7603-MT7612.patch
 rename patches/openwrt/{0006-mac80211-silence-warning-for-missing-rate-information.patch => 0005-mac80211-silence-warning-for-missing-rate-information.patch} (100%)
 rename patches/openwrt/{0007-net-mac80211-override-incompatible-basic-rates-for-mesh.patch => 0006-net-mac80211-override-incompatible-basic-rates-for-mesh.patch} (100%)
 rename patches/openwrt/{0008-net-mac80211-force-backwards-compatible-basic-rates.patch => 0007-net-mac80211-force-backwards-compatible-basic-rates.patch} (100%)

diff --git a/patches/openwrt/0005-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch b/patches/openwrt/0004-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch
similarity index 100%
rename from patches/openwrt/0005-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch
rename to patches/openwrt/0004-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch
diff --git a/patches/openwrt/0004-mt76-include-fixes-for-MT7603-MT7612.patch b/patches/openwrt/0004-mt76-include-fixes-for-MT7603-MT7612.patch
deleted file mode 100644
index 31b263b83..000000000
--- a/patches/openwrt/0004-mt76-include-fixes-for-MT7603-MT7612.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From: David Bauer <mail@david-bauer.net>
-Date: Thu, 14 Mar 2024 09:39:22 +0100
-Subject: mt76: include fixes for MT7603 / MT7612
-
-diff --git a/package/kernel/mt76/patches/0002-mt76x02-avoid-action-ghost-ack.patch b/package/kernel/mt76/patches/0002-mt76x02-avoid-action-ghost-ack.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..0910ed99ef473db9cf4129f88017912b5d63267d
---- /dev/null
-+++ b/package/kernel/mt76/patches/0002-mt76x02-avoid-action-ghost-ack.patch
-@@ -0,0 +1,80 @@
-+From 3c9ecc0c77e85d9ff91faddde59764fbc9316b7c Mon Sep 17 00:00:00 2001
-+From: David Bauer <mail@david-bauer.net>
-+Date: Sat, 2 Mar 2024 13:14:49 +0100
-+Subject: [PATCH 2/2] mt76x02: avoid action ghost-ack
-+
-+On PMF enabled networks, chip reports ACTION frames always as acked.
-+
-+In case a roaming-assistant sens link-measurements periodically,
-+this results in the station never becoming inactive and not being removed
-+from the AP's station list.
-+
-+Avoid this from happening by marking action frames sent on a PMF enabled
-+network as no-ack.
-+
-+Signed-off-by: David Bauer <mail@david-bauer.net>
-+---
-+ mt76x02_mac.c | 27 +++++++++++++++++++++++++++
-+ mt76x02_mac.h |  1 +
-+ 2 files changed, 28 insertions(+)
-+
-+diff --git a/mt76x02_mac.c b/mt76x02_mac.c
-+index d5db6ffd..672e01ec 100644
-+--- a/mt76x02_mac.c
-++++ b/mt76x02_mac.c
-+@@ -544,6 +544,7 @@ void mt76x02_send_tx_status(struct mt76x02_dev *dev,
-+ 	struct ieee80211_tx_status status = {
-+ 		.info = &info
-+ 	};
-++	struct ieee80211_hdr *hdr;
-+ 	static const u8 ac_to_tid[4] = {
-+ 		[IEEE80211_AC_BE] = 0,
-+ 		[IEEE80211_AC_BK] = 1,
-+@@ -619,6 +620,32 @@ void mt76x02_send_tx_status(struct mt76x02_dev *dev,
-+ 		*update = 1;
-+ 	}
-+ 
-++	if (msta && status.skb &&
-++	    (status.info->flags & IEEE80211_TX_STAT_ACK)) {
-++		hdr = (struct ieee80211_hdr *)status.skb->data;
-++
-++		if (ieee80211_has_protected(hdr->frame_control) &&
-++		    ieee80211_is_robust_mgmt_frame(status.skb)) {
-++			/**
-++			 * On PMF enabled networks, chip reports ACTION frames
-++			 * always as acked.
-++			 *
-++			 * In case a roaming-assistant sends link-measurements
-++			 * periodically, this results in the station never
-++			 * becoming inactive and not being removed from the
-++			 * AP's station list.
-++			 */
-++
-++			if (msta->n_enc_mgmt >= 25) {
-++				status.info->flags &= ~IEEE80211_TX_STAT_ACK;
-++			} else {
-++				msta->n_enc_mgmt++;
-++			}
-++		} else {
-++			msta->n_enc_mgmt = 0;
-++		}
-++	}
-++
-+ 	if (status.skb) {
-+ 		info = *status.info;
-+ 		len = status.skb->len;
-+diff --git a/mt76x02_mac.h b/mt76x02_mac.h
-+index 5dc6c834..1bd2288f 100644
-+--- a/mt76x02_mac.h
-++++ b/mt76x02_mac.h
-+@@ -39,6 +39,7 @@ struct mt76x02_sta {
-+ 	struct mt76x02_vif *vif;
-+ 	struct mt76x02_tx_status status;
-+ 	int n_frames;
-++	u8 n_enc_mgmt;
-+ 
-+ 	struct ewma_pktlen pktlen;
-+ };
-+-- 
-+2.43.0
-+
diff --git a/patches/openwrt/0006-mac80211-silence-warning-for-missing-rate-information.patch b/patches/openwrt/0005-mac80211-silence-warning-for-missing-rate-information.patch
similarity index 100%
rename from patches/openwrt/0006-mac80211-silence-warning-for-missing-rate-information.patch
rename to patches/openwrt/0005-mac80211-silence-warning-for-missing-rate-information.patch
diff --git a/patches/openwrt/0007-net-mac80211-override-incompatible-basic-rates-for-mesh.patch b/patches/openwrt/0006-net-mac80211-override-incompatible-basic-rates-for-mesh.patch
similarity index 100%
rename from patches/openwrt/0007-net-mac80211-override-incompatible-basic-rates-for-mesh.patch
rename to patches/openwrt/0006-net-mac80211-override-incompatible-basic-rates-for-mesh.patch
diff --git a/patches/openwrt/0008-net-mac80211-force-backwards-compatible-basic-rates.patch b/patches/openwrt/0007-net-mac80211-force-backwards-compatible-basic-rates.patch
similarity index 100%
rename from patches/openwrt/0008-net-mac80211-force-backwards-compatible-basic-rates.patch
rename to patches/openwrt/0007-net-mac80211-force-backwards-compatible-basic-rates.patch
-- 
GitLab