diff -uNr old/debugfs.c new/debugfs.c
--- old/debugfs.c	2023-04-17 13:49:16.837258000 +0800
+++ new/debugfs.c	2023-04-18 17:32:37.916358000 +0800
@@ -44,9 +44,11 @@
 static int
 mt76_napi_threaded_get(void *data, u64 *val)
 {
+#ifdef MT76_MTK_WOE	
 	struct mt76_dev *dev = data;
 
 	*val = dev->napi_dev.threaded;
+#endif	//napi_dev is without threaded, which is not defined in <linux/netdevice.h>
 	return 0;
 }
 
diff -uNr old/dma.c new/dma.c
--- old/dma.c	2023-04-13 14:20:25.273906000 +0800
+++ new/dma.c	2023-04-18 17:35:20.666356000 +0800
@@ -942,8 +942,9 @@
 	init_dummy_netdev(&dev->tx_napi_dev);
 	snprintf(dev->napi_dev.name, sizeof(dev->napi_dev.name), "%s",
 		 wiphy_name(dev->hw->wiphy));
+#ifdef MT76_MTK_WOE		 
 	dev->napi_dev.threaded = 1;
-
+#endif
 	mt76_for_each_q_rx(dev, i) {
 		netif_napi_add(&dev->napi_dev, &dev->napi[i], poll, 64);
 		mt76_dma_rx_fill(dev, &dev->q_rx[i]);
diff -uNr old/mt76.h new/mt76.h
--- old/mt76.h	2023-04-12 17:50:59.137023000 +0800
+++ new/mt76.h	2023-04-18 20:02:15.041728000 +0800
@@ -15,6 +15,7 @@
 #include <linux/average.h>
 #include <linux/soc/mediatek/mtk_wed.h>
 #include <net/mac80211.h>
+#include <linux/pci.h>
 #include "util.h"
 #include "testmode.h"
 
@@ -1233,7 +1234,7 @@
 	return (struct mt76_testmode_entry_data *)((u8 *)wcid +
 						   phy->hw->sta_data_size);
 }
-
+#define list_entry_is_head(pos, head, member) (&pos->member == (head))
 #define mt76_tm_for_each_entry(phy, wcid, ed)				\
 	for (wcid = mt76_testmode_first_entry(phy),			\
 	     ed = mt76_testmode_entry_data(phy, wcid);			\
diff -uNr old/mt7915/dma.c new/mt7915/dma.c
--- old/mt7915/dma.c	2023-04-12 20:52:19.014233000 +0800
+++ new/mt7915/dma.c	2023-04-18 17:27:48.133353000 +0800
@@ -590,6 +590,7 @@
 	mt7915_dma_disable(dev, force);
 
 	/* set wifi reset done, wait FE reset */
+#ifdef MT76_MTK_WOE
 	if (mtk_wed_device_active(wed) && atomic_read(&wed->fe_reset)) {
 		atomic_set(&wed->fe_reset, 0);
 		rtnl_lock();
@@ -597,7 +598,7 @@
 		rtnl_unlock();
 		wait_for_completion(&wed->fe_reset_done);
 	}
-
+#endif
 	/* reset hw queues */
 	for (i = 0; i < __MT_TXQ_MAX; i++) {
 		mt76_queue_reset(dev, dev->mphy.q_tx[i]);