mt76x2: fix for 6.1 (coolsnowwolf#10863)

solarflows · Feb 5, 2023 · 91bc6bf · 91bc6bf
1 parent 60178fd
commit 91bc6bf
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git 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
@@ -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;
+