From 91bc6bfd328b8135ec579cf372f735a49b6680a0 Mon Sep 17 00:00:00 2001
From: fishg <1423545+fishg@users.noreply.github.com>
Date: Sun, 5 Feb 2023 13:05:48 +0800
Subject: [PATCH] mt76x2: fix for 6.1 (#10863)

---
 package/kernel/mac80211/Makefile                    |  2 ++
 .../mt76/patches/091-fix-linux-6.1-build.patch      | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index 7e9e5d1c9..3e4a2aaae 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -310,6 +310,8 @@ define Build/Prepare
 		$(PKG_BUILD_DIR)/backport-include/linux/bcm47xx_nvram.h
 
 	echo 'compat-wireless-$(PKG_VERSION)-$(PKG_RELEASE)-$(REVISION)' > $(PKG_BUILD_DIR)/compat_version
+	sed -i '/#define is_signed_type/i#ifndef is_signed_type' $(PKG_BUILD_DIR)/include/linux/overflow.h
+	sed -i '/#define is_signed_type/a#endif' $(PKG_BUILD_DIR)/include/linux/overflow.h
 endef
 
 ifneq ($(CONFIG_PACKAGE_kmod-cfg80211),)
diff --git a/package/kernel/mt76/patches/091-fix-linux-6.1-build.patch b/package/kernel/mt76/patches/091-fix-linux-6.1-build.patch
index 592d523f0..03e0a6f7e 100644
--- a/package/kernel/mt76/patches/091-fix-linux-6.1-build.patch
+++ b/package/kernel/mt76/patches/091-fix-linux-6.1-build.patch
@@ -31,3 +31,16 @@
  		mt76_dma_rx_fill(dev, &dev->q_rx[i]);
  		napi_enable(&dev->napi[i]);
  	}
+--- a/mt76.h
++++ b/mt76.h
+@@ -37,6 +37,9 @@
+ #define MT_WED_Q_TX(_n)		__MT_WED_Q(MT76_WED_Q_TX, _n)
+ #define MT_WED_Q_RX(_n)		__MT_WED_Q(MT76_WED_Q_RX, _n)
+ #define MT_WED_Q_TXFREE		__MT_WED_Q(MT76_WED_Q_TXFREE, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)
++#define netif_tx_napi_add netif_napi_add_tx_weight
++#endif
+
+ struct mt76_dev;
+ struct mt76_phy;
+ 
\ No newline at end of file