diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c
old mode 100755
new mode 100644
diff --git a/core/rtw_mp.c b/core/rtw_mp.c
index 8d2c992..130dd98 100644
--- a/core/rtw_mp.c
+++ b/core/rtw_mp.c
@@ -310,7 +310,7 @@ static void mp_init_xmit_attrib(struct mp_tx *pmptx, PADAPTER padapter)
 #endif
 }
 
-s32 init_mp_priv(PADAPTER padapter)
+void init_mp_priv(PADAPTER padapter)
 {
 	struct mp_priv *pmppriv = &padapter->mppriv;
 	PHAL_DATA_TYPE pHalData;
@@ -351,7 +351,6 @@ s32 init_mp_priv(PADAPTER padapter)
 	pHalData->AntennaRxPath = pmppriv->antenna_rx;
 	pHalData->antenna_tx_path = pmppriv->antenna_tx;
 
-	return _SUCCESS;
 }
 
 void free_mp_priv(struct mp_priv *pmp_priv)
diff --git a/core/rtw_recv.c b/core/rtw_recv.c
old mode 100755
new mode 100644
diff --git a/include/drv_conf.h b/include/drv_conf.h
old mode 100755
new mode 100644
diff --git a/include/hal_data.h b/include/hal_data.h
old mode 100755
new mode 100644
diff --git a/include/rtl8723b_hal.h b/include/rtl8723b_hal.h
old mode 100755
new mode 100644
diff --git a/include/rtl8723b_led.h b/include/rtl8723b_led.h
old mode 100755
new mode 100644
diff --git a/include/rtl8723b_recv.h b/include/rtl8723b_recv.h
old mode 100755
new mode 100644
diff --git a/include/rtl8723b_spec.h b/include/rtl8723b_spec.h
old mode 100755
new mode 100644
diff --git a/include/rtl8723b_xmit.h b/include/rtl8723b_xmit.h
old mode 100755
new mode 100644
diff --git a/include/rtl8814a_cmd.h b/include/rtl8814a_cmd.h
old mode 100755
new mode 100644
diff --git a/include/rtl8814a_hal.h b/include/rtl8814a_hal.h
old mode 100755
new mode 100644
diff --git a/include/rtl8814a_recv.h b/include/rtl8814a_recv.h
old mode 100755
new mode 100644
diff --git a/include/rtl8814a_spec.h b/include/rtl8814a_spec.h
old mode 100755
new mode 100644
diff --git a/include/rtl8814a_xmit.h b/include/rtl8814a_xmit.h
old mode 100755
new mode 100644
diff --git a/include/rtl8821ce_hal.h b/include/rtl8821ce_hal.h
old mode 100755
new mode 100644
diff --git a/include/rtl8822be_hal.h b/include/rtl8822be_hal.h
old mode 100755
new mode 100644
diff --git a/include/rtw_mp.h b/include/rtw_mp.h
index 2fbf74e..5d19e5c 100644
--- a/include/rtw_mp.h
+++ b/include/rtw_mp.h
@@ -688,7 +688,7 @@ extern struct mp_xmit_frame *alloc_mp_xmitframe(struct mp_priv *pmp_priv);
 extern int free_mp_xmitframe(struct xmit_priv *pxmitpriv, struct mp_xmit_frame *pmp_xmitframe);
 #endif
 
-extern s32 init_mp_priv(PADAPTER padapter);
+void init_mp_priv(PADAPTER padapter);
 extern void free_mp_priv(struct mp_priv *pmp_priv);
 extern s32 MPT_InitializeAdapter(PADAPTER padapter, u8 Channel);
 extern void MPT_DeInitAdapter(PADAPTER padapter);
diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
index b79cd8f..afd81c7 100644
--- a/os_dep/linux/ioctl_cfg80211.c
+++ b/os_dep/linux/ioctl_cfg80211.c
@@ -1092,6 +1092,9 @@ check_bss:
 		struct ieee80211_channel *notify_channel;
 		u32 freq;
 		u16 channel = cur_network->network.Configuration.DSConfig;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0))
+		struct cfg80211_roam_info roam_info;
+#endif
 
 		freq = rtw_ch2freq(channel);
 		notify_channel = ieee80211_get_channel(wiphy, freq);
diff --git a/os_dep/linux/ioctl_mp.c b/os_dep/linux/ioctl_mp.c
index 8598e87..6f1ebd2 100644
--- a/os_dep/linux/ioctl_mp.c
+++ b/os_dep/linux/ioctl_mp.c
@@ -1476,8 +1476,6 @@ int rtw_mp_mon(struct net_device *dev,
 	LeaveAllPowerSaveMode(padapter);
 
 #ifdef CONFIG_MP_INCLUDED
-	if (init_mp_priv(padapter) == _FAIL)
-		RTW_INFO("%s: initialize MP private data Fail!\n", __func__);
 	padapter->mppriv.channel = 6;
 
 	bstart = strncmp(extra, "start", 5); /* strncmp TRUE is 0*/
diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c
index 8429924..7392ce1 100644
--- a/os_dep/linux/os_intfs.c
+++ b/os_dep/linux/os_intfs.c
@@ -2333,8 +2333,7 @@ u8 rtw_init_drv_sw(_adapter *padapter)
 	/* _rtw_memset((u8 *)&padapter->qospriv, 0, sizeof (struct qos_priv)); */ /* move to mlme_priv */
 
 #ifdef CONFIG_MP_INCLUDED
-	if (init_mp_priv(padapter) == _FAIL)
-		RTW_INFO("%s: initialize MP private data Fail!\n", __func__);
+	init_mp_priv(padapter);
 #endif
 
 	rtw_hal_dm_init(padapter);