From 838a2844a425ebcb7452f2103e8dc771bb6fe69f Mon Sep 17 00:00:00 2001
From: Josef Schlehofer <josef.schlehofer@nic.cz>
Date: Tue, 25 Oct 2022 07:16:37 +0200
Subject: [PATCH] patches/openwrt: mt76: backport patch to fix compile
Fixes:
build/build_dir/target-arm_cortex-a9+vfpv3-d16_musl_eabi/linux-mvebu_cortexa9/mt76-2022-10-01-72b87836/mt7915/init.c:330:37: error: 'IEEE80211_MAX_AMPDU_BUF' undeclared (first use in this function); did you mean 'IEEE80211_MIN_AMPDU_BUF'?
hw->max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF;
^~~~~~~~~~~~~~~~~~~~~~~
IEEE80211_MIN_AMPDU_BUF
---
.../0006-Backport-mt76.patch | 31 ++++++++++++++++---
1 file changed, 26 insertions(+), 5 deletions(-)
diff --git a/patches/openwrt/a-new-kernel-5.15/0006-Backport-mt76.patch b/patches/openwrt/a-new-kernel-5.15/0006-Backport-mt76.patch
index 7e6bc926e..710ec16c6 100644
--- a/patches/openwrt/a-new-kernel-5.15/0006-Backport-mt76.patch
+++ b/patches/openwrt/a-new-kernel-5.15/0006-Backport-mt76.patch
@@ -1,18 +1,20 @@
-From 686e2bcfae4c851c1700cdb37f3aecaf7b8785e5 Mon Sep 17 00:00:00 2001
+From 2e0b993befd4b176ee6edbf2a549b7d0f422daed Mon Sep 17 00:00:00 2001
From: Josef Schlehofer <pepe.schlehofer@gmail.com>
-Date: Mon, 29 Aug 2022 10:38:12 +0200
-Subject: [PATCH] mt76: backport version from the OpenWrt master branch
+Date: Tue, 25 Oct 2022 07:15:58 +0200
+Subject: [PATCH] mt76: backport from OpenWrt master branch
---
package/kernel/mt76/Makefile | 53 +++++++++++++---
...ss-the-dst-buffer-to-of_get_mac_addr.patch | 26 --------
+ .../patches/100-aggregation-definitions.patch | 13 ++++
...ix-encap-offload-ethernet-type-check.patch | 63 -------------------
- 3 files changed, 45 insertions(+), 97 deletions(-)
+ 4 files changed, 58 insertions(+), 97 deletions(-)
delete mode 100644 package/kernel/mt76/patches/100-Revert-of-net-pass-the-dst-buffer-to-of_get_mac_addr.patch
+ create mode 100644 package/kernel/mt76/patches/100-aggregation-definitions.patch
delete mode 100644 package/kernel/mt76/patches/101-fix-encap-offload-ethernet-type-check.patch
diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
-index 8210478c37..ff58d27bc2 100644
+index 8210478c37..628ea79ec9 100644
--- a/package/kernel/mt76/Makefile
+++ b/package/kernel/mt76/Makefile
@@ -8,9 +8,9 @@ PKG_LICENSE_FILES:=
@@ -159,6 +161,25 @@ index 24b1240548..0000000000
-
- if (!is_valid_ether_addr(phy->macaddr)) {
- eth_random_addr(phy->macaddr);
+diff --git a/package/kernel/mt76/patches/100-aggregation-definitions.patch b/package/kernel/mt76/patches/100-aggregation-definitions.patch
+new file mode 100644
+index 0000000000..a88d57133f
+--- /dev/null
++++ b/package/kernel/mt76/patches/100-aggregation-definitions.patch
+@@ -0,0 +1,13 @@
++--- a/mt7915/init.c
+++++ b/mt7915/init.c
++@@ -327,8 +327,8 @@ mt7915_init_wiphy(struct ieee80211_hw *h
++ struct mt7915_dev *dev = phy->dev;
++
++ hw->queues = 4;
++- hw->max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF;
++- hw->max_tx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF;
+++ hw->max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF_HE;
+++ hw->max_tx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF_HE;
++ hw->netdev_features = NETIF_F_RXCSUM;
++
++ hw->radiotap_timestamp.units_pos =
diff --git a/package/kernel/mt76/patches/101-fix-encap-offload-ethernet-type-check.patch b/package/kernel/mt76/patches/101-fix-encap-offload-ethernet-type-check.patch
deleted file mode 100644
index d81aa4dfa3..0000000000
--
GitLab