From 9f2e9649edc3c6d20abdb4b60671ce747b8ef12a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AA=B7=E9=AB=85=E5=A4=B4?= Date: Sat, 11 Mar 2023 18:07:12 +0800 Subject: [PATCH] Delete 0002-fix-linux-6.1-build.patch --- .../patches/0002-fix-linux-6.1-build.patch | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 package/kernel/mt76/patches/0002-fix-linux-6.1-build.patch diff --git a/package/kernel/mt76/patches/0002-fix-linux-6.1-build.patch b/package/kernel/mt76/patches/0002-fix-linux-6.1-build.patch deleted file mode 100644 index cd6c18729..000000000 --- a/package/kernel/mt76/patches/0002-fix-linux-6.1-build.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/dma.c -+++ b/dma.c -@@ -919,7 +919,11 @@ mt76_dma_init(struct mt76_dev *dev, - init_completion(&dev->mmio.wed_reset_complete); - - mt76_for_each_q_rx(dev, i) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0) - netif_napi_add(&dev->napi_dev, &dev->napi[i], poll); -+#else -+ netif_napi_add_weight(&dev->napi_dev, &dev->napi[i], poll); -+#endif - mt76_dma_rx_fill(dev, &dev->q_rx[i], false); - 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; ---- a/mt7921/dma.c -+++ b/mt7921/dma.c -@@ -279,6 +279,7 @@ int mt7921_dma_init(struct mt7921_dev *dev) - if (ret) - return ret; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0) - ret = mt76_init_queues(dev, mt7921_poll_rx); - if (ret < 0) - return ret; -@@ -286,7 +287,11 @@ int mt7921_dma_init(struct mt7921_dev *dev) - netif_napi_add_tx(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi, - mt7921_poll_tx); - napi_enable(&dev->mt76.tx_napi); -- -+#else -+ netif_napi_add_tx_weight(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi, -+ mt7921_poll_tx, NAPI_POLL_WEIGHT); -+ napi_enable(&dev->mt76.tx_napi); -+#endif - return mt7921_dma_enable(dev); - }