diff --git a/drivers/net/wireless/realtek/rtl8822ce/Makefile b/drivers/net/wireless/realtek/rtl8822ce/Makefile
old mode 100755
new mode 100644
index 20c90fec..1697c416
--- a/drivers/net/wireless/realtek/rtl8822ce/Makefile
+++ b/drivers/net/wireless/realtek/rtl8822ce/Makefile
@@ -14,13 +14,16 @@ EXTRA_CFLAGS += -Wno-unused-variable
 #EXTRA_CFLAGS += -Wno-unused-function
 #EXTRA_CFLAGS += -Wno-unused
 #EXTRA_CFLAGS += -Wno-uninitialized
+EXTRA_CFLAGS += -Wno-missing-prototypes
+EXTRA_CFLAGS += -Wno-address
 
 GCC_VER_49 := $(shell echo `$(CC) -dumpversion | cut -f1-2 -d.` \>= 4.9 | bc )
 ifeq ($(GCC_VER_49),1)
 EXTRA_CFLAGS += -Wno-date-time	# Fix compile error && warning on gcc 4.9 and later
 endif
 
-EXTRA_CFLAGS += -I$(src)/include
+SOURCETREE = $(srctree.nvidia-oot)/drivers/net/wireless/realtek/rtl8822ce
+EXTRA_CFLAGS += -I$(SOURCETREE)/include
 
 EXTRA_LDFLAGS += --strip-debug
 
@@ -107,7 +110,7 @@ endif
 CONFIG_RTW_DEBUG = y
 # default log level is _DRV_INFO_ = 4,
 # please refer to "How_to_set_driver_debug_log_level.doc" to set the available level.
-CONFIG_RTW_LOG_LEVEL = 4
+CONFIG_RTW_LOG_LEVEL = 0
 
 # enable /proc/net/rtlxxxx/ debug interfaces
 CONFIG_PROC_DEBUG = y
@@ -147,7 +150,8 @@ CONFIG_SECURITY_MEM = n
 CONFIG_SECURITY_MEM_ADDR = 0
 CONFIG_SECURITY_MEM_SIZE = 3686400
 ###################### Platform Related #######################
-CONFIG_PLATFORM_I386_PC = y
+CONFIG_PLATFORM_TEGRA = y
+CONFIG_PLATFORM_I386_PC = n
 CONFIG_PLATFORM_ANDROID_X86 = n
 CONFIG_PLATFORM_ANDROID_INTEL_X86 = n
 CONFIG_PLATFORM_JB_X86 = n
@@ -280,10 +284,10 @@ _HAL_INTFS_FILES :=	hal/hal_intf.o \
 			hal/led/hal_$(HCI_NAME)_led.o
 
 
-EXTRA_CFLAGS += -I$(src)/platform
+EXTRA_CFLAGS += -I$(SOURCETREE)/platform
 _PLATFORM_FILES := platform/platform_ops.o
 
-EXTRA_CFLAGS += -I$(src)/hal/btc
+EXTRA_CFLAGS += -I$(SOURCETREE)/hal/btc
 
 ########### HAL_RTL8188E #################################
 ifeq ($(CONFIG_RTL8188E), y)
@@ -1365,6 +1369,16 @@ EXTRA_CFLAGS += -DSECURITY_MEM_ADDR=$(CONFIG_SECURITY_MEM_ADDR)
 EXTRA_CFLAGS += -DSECURITY_MEM_SIZE=$(CONFIG_SECURITY_MEM_SIZE)
 endif
 
+ifeq ($(CONFIG_PLATFORM_TEGRA), y)
+ARCH = arm
+KVER := $(shell uname -r)
+KSRC := /lib/modules/$(KVER)/build
+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+EXTRA_CFLAGS += -Wno-error=date-time
+MODULE_NAME = rtl8822ce
+endif
+
 ifeq ($(CONFIG_PLATFORM_I386_PC), y)
 EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
 EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
@@ -2366,7 +2380,7 @@ endif
 ifneq ($(KERNELRELEASE),)
 
 ########### this part for *.mk ############################
-include $(src)/hal/phydm/phydm.mk
+include $(SOURCETREE)/hal/phydm/phydm.mk
 
 ########### HAL_RTL8822B #################################
 ifeq ($(CONFIG_RTL8822B), y)
@@ -2380,7 +2394,7 @@ endif
 
 ########### HAL_RTL8822C #################################
 ifeq ($(CONFIG_RTL8822C), y)
-include $(src)/rtl8822c.mk
+include $(SOURCETREE)/rtl8822c.mk
 endif
 
 ########### HAL_RTL8814B #################################
@@ -2443,7 +2457,7 @@ ifeq ($(CONFIG_SDIO_HCI), y)
 rtk_core += core/rtw_sdio.o
 endif
 
-EXTRA_CFLAGS += -I$(src)/core/crypto
+EXTRA_CFLAGS += -I$(SOURCETREE)/core/crypto
 rtk_core += \
 		core/crypto/aes-internal.o \
 		core/crypto/aes-internal-enc.o \
@@ -2477,7 +2491,7 @@ ifeq ($(CONFIG_RTL8723B), y)
 $(MODULE_NAME)-$(CONFIG_MP_INCLUDED)+= core/rtw_bt_mp.o
 endif
 
-obj-$(CONFIG_RTL8822CE) := $(MODULE_NAME).o
+obj-m := $(MODULE_NAME).o
 
 else
 
diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_ap.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_ap.c
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_debug.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_debug.c
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_ft.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_ft.c
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_ieee80211.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_ieee80211.c
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_mbo.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_mbo.c
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_mlme.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_mlme.c
old mode 100755
new mode 100644
index 4e89efb6..752a3300
--- a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_mlme.c
+++ b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_mlme.c
@@ -144,13 +144,13 @@ sint	_rtw_init_mlme_priv(_adapter *padapter)
 #endif
 
 #ifdef CONFIG_LAYER2_ROAMING
-#define RTW_ROAM_SCAN_RESULT_EXP_MS (5*1000)
+#define RTW_ROAM_SCAN_RESULT_EXP_MS (10*1000)
 #define RTW_ROAM_IDLE_RSSI_DIFF_TH 5
 #define RTW_ROAM_BUSY_RSSI_DIFF_TH 10
-#define RTW_ROAM_SCAN_INTERVAL (5)    /* 5*(2 second)*/
-#define RTW_ROAM_IDLE_RSSI_THRESHOLD 35
-#define RTW_ROAM_BUSY_RSSI_THRESHOLD 30
-#define RTW_ROAM_DICONNECT_DELAY	50
+#define RTW_ROAM_SCAN_INTERVAL (2)    /* 5*(2 second)*/
+#define RTW_ROAM_IDLE_RSSI_THRESHOLD 40
+#define RTW_ROAM_BUSY_RSSI_THRESHOLD 40
+#define RTW_ROAM_DICONNECT_DELAY	20
 	_rtw_spinlock_init(&pmlmepriv->clnt_auth_lock);
 	pmlmepriv->roam_flags = CONFIG_ROAMING_FLAG;
 
diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_mlme_ext.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_mlme_ext.c
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_mp.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_mp.c
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_pwrctrl.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_pwrctrl.c
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_recv.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_recv.c
old mode 100755
new mode 100644
index 23b22610..2d79f55e
--- a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_recv.c
+++ b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_recv.c
@@ -4500,7 +4500,7 @@ static void rtw_signal_stat_timer_hdl(void *ctx)
 			sprintf(avg + strlen(avg), " %2d", recvpriv->signal_avg[(s+i)%ROW_LEN]);
 
 			if ((i+1)%16 == 0) {
-				printk("%s\n%s\n", row, avg);
+				RTW_INFO("%s\n%s\n", row, avg);
 				memset (row, 0, sizeof(row));
 				memset (avg, 0, sizeof(row));
 				sprintf(row, "[ROW]");
@@ -4509,7 +4509,7 @@ static void rtw_signal_stat_timer_hdl(void *ctx)
 		}
 
 		if ((i)%16 != 0)
-			printk("%s\n%s\n", row, avg);
+			RTW_INFO("%s\n%s\n", row, avg);
 
 		recvpriv->signal_row_idx = 0;
 		memset (recvpriv->signal_row, 0, ROW_LEN);
@@ -4592,7 +4592,7 @@ static void rtw_signal_stat_timer_hdl(void *ctx)
 		if (MLME_IS_STA(adapter))
 			adapter->mlmepriv.cur_network_scanned->network.PhyInfo.SignalStrength = recvpriv->signal_strength;
 #ifdef RTW_RSSI_DBG
-		printk("%d + %d --> %d\n", old_s, avg_signal_strength, recvpriv->signal_strength);
+		RTW_INFO("%d + %d --> %d\n", old_s, avg_signal_strength, recvpriv->signal_strength);
 		RTW_INFO("signal_strength:%3u\n", recvpriv->signal_strength);
 #endif
 #if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1
diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_vht.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_vht.c
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_wlan_util.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_wlan_util.c
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_wnm.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_wnm.c
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/btc/halbtc8822c.h b/drivers/net/wireless/realtek/rtl8822ce/hal/btc/halbtc8822c.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/btc/halbtc8822cwifionly.c b/drivers/net/wireless/realtek/rtl8822ce/hal/btc/halbtc8822cwifionly.c
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/btc/halbtc8822cwifionly.h b/drivers/net/wireless/realtek/rtl8822ce/hal/btc/halbtc8822cwifionly.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_PCIE.c b/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_PCIE.c
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_PCIE.h b/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_PCIE.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_SDIO.c b/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_SDIO.c
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_SDIO.h b/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_SDIO.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_USB.c b/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_USB.c
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_USB.h b/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_USB.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/hal_com.c b/drivers/net/wireless/realtek/rtl8822ce/hal/hal_com.c
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/hal_dm.c b/drivers/net/wireless/realtek/rtl8822ce/hal/hal_dm.c
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/hal_mp.c b/drivers/net/wireless/realtek/rtl8822ce/hal/hal_mp.c
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/phydm/phydm.mk b/drivers/net/wireless/realtek/rtl8822ce/hal/phydm/phydm.mk
index 2c007b79..f512d2f7 100644
--- a/drivers/net/wireless/realtek/rtl8822ce/hal/phydm/phydm.mk
+++ b/drivers/net/wireless/realtek/rtl8822ce/hal/phydm/phydm.mk
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS += -I$(src)/hal/phydm
+EXTRA_CFLAGS += -I$(SOURCETREE)/hal/phydm
 
 _PHYDM_FILES := hal/phydm/phydm_debug.o	\
 								hal/phydm/phydm_antdiv.o\
@@ -256,4 +256,4 @@ _PHYDM_FILES += hal/phydm/$(RTL871X)/halhwimg8723f_bb.o\
 								hal/phydm/halrf/$(RTL871X)/halrf_txgapk_8723f.o\
 								hal/phydm/halrf/$(RTL871X)/halrf_rfk_init_8723f.o\
 								hal/phydm/halrf/$(RTL871X)/halhwimg8723f_rf.o
-endif
\ No newline at end of file
+endif
diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/phydm/phydm_debug.h b/drivers/net/wireless/realtek/rtl8822ce/hal/phydm/phydm_debug.h
index 06e809b5..08c6a52b 100644
--- a/drivers/net/wireless/realtek/rtl8822ce/hal/phydm/phydm_debug.h
+++ b/drivers/net/wireless/realtek/rtl8822ce/hal/phydm/phydm_debug.h
@@ -88,8 +88,6 @@
 #elif (DM_ODM_SUPPORT_TYPE == ODM_CE) && defined(DM_ODM_CE_MAC80211)
 	#define PHYDM_SNPRINTF		snprintf
 #elif (DM_ODM_SUPPORT_TYPE == ODM_CE)
-	#undef	pr_debug
-	#define pr_debug		printk
 	#define RT_PRINTK(fmt, args...)	pr_debug(fmt, ## args)
 	#define	RT_DISP(dbgtype, dbgflag, printstr)
 	#define RT_TRACE(adapter, comp, drv_level, fmt, args...)	\
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/autoconf.h b/drivers/net/wireless/realtek/rtl8822ce/include/autoconf.h
index 24d78a6c..9d0858ef 100644
--- a/drivers/net/wireless/realtek/rtl8822ce/include/autoconf.h
+++ b/drivers/net/wireless/realtek/rtl8822ce/include/autoconf.h
@@ -16,7 +16,7 @@
 #define CONFIG_HEXFILE_CHANNEL_PLAN
 #define CONFIG_HEXFILE_POWER_LIMIT
 #define RTW_HEXFILE_LEN 3072
-#define RTW_HEXFILE_NAME "setting.bin"
+#define RTW_HEXFILE_NAME "/lib/firmware/rtl8822_setting.bin"
 #define CONFIG_SINGLE_IMG
 /* #define CONFIG_DISABLE_ODM */
 
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/hal_com.h b/drivers/net/wireless/realtek/rtl8822ce/include/hal_com.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/hal_com_h2c.h b/drivers/net/wireless/realtek/rtl8822ce/include/hal_com_h2c.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/hal_com_phycfg.h b/drivers/net/wireless/realtek/rtl8822ce/include/hal_com_phycfg.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/ieee80211.h b/drivers/net/wireless/realtek/rtl8822ce/include/ieee80211.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/osdep_service_linux.h b/drivers/net/wireless/realtek/rtl8822ce/include/osdep_service_linux.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/recv_osdep.h b/drivers/net/wireless/realtek/rtl8822ce/include/recv_osdep.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtl8723b_hal.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtl8723b_hal.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtl8723b_led.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtl8723b_led.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtl8723b_recv.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtl8723b_recv.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtl8723b_spec.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtl8723b_spec.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtl8723b_xmit.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtl8723b_xmit.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtl8812a_xmit.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtl8812a_xmit.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtl8814a_cmd.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtl8814a_cmd.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtl8814a_hal.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtl8814a_hal.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtl8814a_recv.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtl8814a_recv.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtl8814a_spec.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtl8814a_spec.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtl8814a_xmit.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtl8814a_xmit.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtl8814b_hal.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtl8814b_hal.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtl8814bu_hal.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtl8814bu_hal.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtl8821ce_hal.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtl8821ce_hal.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtl8822be_hal.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtl8822be_hal.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtl8822c_hal.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtl8822c_hal.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtl8822ce_hal.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtl8822ce_hal.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtl8822cs_hal.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtl8822cs_hal.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtl8822cu_hal.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtl8822cu_hal.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtw_debug.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtw_debug.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtw_ft.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtw_ft.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtw_mbo.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtw_mbo.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtw_mlme.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtw_mlme.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtw_mlme_ext.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtw_mlme_ext.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtw_pwrctrl.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtw_pwrctrl.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtw_recv.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtw_recv.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtw_vht.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtw_vht.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/rtw_wnm.h b/drivers/net/wireless/realtek/rtl8822ce/include/rtw_wnm.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/sta_info.h b/drivers/net/wireless/realtek/rtl8822ce/include/sta_info.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/wifi.h b/drivers/net/wireless/realtek/rtl8822ce/include/wifi.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/ioctl_cfg80211.c
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/recv_linux.c b/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/recv_linux.c
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/rtw_android.c b/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/rtw_android.c
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/rtw_proc.c b/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/rtw_proc.c
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/rtw_proc.h b/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/rtw_proc.h
old mode 100755
new mode 100644
diff --git a/drivers/net/wireless/realtek/rtl8822ce/rtl8822c.mk b/drivers/net/wireless/realtek/rtl8822ce/rtl8822c.mk
index ee62bcdf..90962071 100644
--- a/drivers/net/wireless/realtek/rtl8822ce/rtl8822c.mk
+++ b/drivers/net/wireless/realtek/rtl8822ce/rtl8822c.mk
@@ -49,7 +49,7 @@ _HAL_INTFS_FILES +=hal/efuse/rtl8822c/HalEfuseMask8822C_SDIO.o
 _HAL_INTFS_FILES +=hal/hal_hci/hal_sdio_coex.o
 endif
 
-include $(src)/halmac.mk
+include $(SOURCETREE)/halmac.mk
 
 _BTC_FILES += hal/btc/halbtc8822cwifionly.o
 ifeq ($(CONFIG_BT_COEXIST), y)