use void in init_mp_priv() function return allways _SUCCESS

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)

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);

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);

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*/

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);