use void in init_mp_priv() function return allways _SUCCESS

This commit is contained in:
kimocoder
2019-02-14 17:54:31 +01:00
parent cea7924b19
commit ba7d6c3883
21 changed files with 6 additions and 7 deletions
Executable → Regular
View File
+1 -2
View File
@@ -310,7 +310,7 @@ static void mp_init_xmit_attrib(struct mp_tx *pmptx, PADAPTER padapter)
#endif #endif
} }
s32 init_mp_priv(PADAPTER padapter) void init_mp_priv(PADAPTER padapter)
{ {
struct mp_priv *pmppriv = &padapter->mppriv; struct mp_priv *pmppriv = &padapter->mppriv;
PHAL_DATA_TYPE pHalData; PHAL_DATA_TYPE pHalData;
@@ -351,7 +351,6 @@ s32 init_mp_priv(PADAPTER padapter)
pHalData->AntennaRxPath = pmppriv->antenna_rx; pHalData->AntennaRxPath = pmppriv->antenna_rx;
pHalData->antenna_tx_path = pmppriv->antenna_tx; pHalData->antenna_tx_path = pmppriv->antenna_tx;
return _SUCCESS;
} }
void free_mp_priv(struct mp_priv *pmp_priv) void free_mp_priv(struct mp_priv *pmp_priv)
Executable → Regular
View File
Executable → Regular
View File
Executable → Regular
View File
Executable → Regular
View File
Executable → Regular
View File
Executable → Regular
View File
Executable → Regular
View File
Executable → Regular
View File
Executable → Regular
View File
Executable → Regular
View File
Executable → Regular
View File
Executable → Regular
View File
Executable → Regular
View File
Executable → Regular
View File
Executable → Regular
View File
+1 -1
View File
@@ -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); extern int free_mp_xmitframe(struct xmit_priv *pxmitpriv, struct mp_xmit_frame *pmp_xmitframe);
#endif #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 void free_mp_priv(struct mp_priv *pmp_priv);
extern s32 MPT_InitializeAdapter(PADAPTER padapter, u8 Channel); extern s32 MPT_InitializeAdapter(PADAPTER padapter, u8 Channel);
extern void MPT_DeInitAdapter(PADAPTER padapter); extern void MPT_DeInitAdapter(PADAPTER padapter);
+3
View File
@@ -1092,6 +1092,9 @@ check_bss:
struct ieee80211_channel *notify_channel; struct ieee80211_channel *notify_channel;
u32 freq; u32 freq;
u16 channel = cur_network->network.Configuration.DSConfig; 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); freq = rtw_ch2freq(channel);
notify_channel = ieee80211_get_channel(wiphy, freq); notify_channel = ieee80211_get_channel(wiphy, freq);
-2
View File
@@ -1476,8 +1476,6 @@ int rtw_mp_mon(struct net_device *dev,
LeaveAllPowerSaveMode(padapter); LeaveAllPowerSaveMode(padapter);
#ifdef CONFIG_MP_INCLUDED #ifdef CONFIG_MP_INCLUDED
if (init_mp_priv(padapter) == _FAIL)
RTW_INFO("%s: initialize MP private data Fail!\n", __func__);
padapter->mppriv.channel = 6; padapter->mppriv.channel = 6;
bstart = strncmp(extra, "start", 5); /* strncmp TRUE is 0*/ bstart = strncmp(extra, "start", 5); /* strncmp TRUE is 0*/
+1 -2
View File
@@ -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 */ /* _rtw_memset((u8 *)&padapter->qospriv, 0, sizeof (struct qos_priv)); */ /* move to mlme_priv */
#ifdef CONFIG_MP_INCLUDED #ifdef CONFIG_MP_INCLUDED
if (init_mp_priv(padapter) == _FAIL) init_mp_priv(padapter);
RTW_INFO("%s: initialize MP private data Fail!\n", __func__);
#endif #endif
rtw_hal_dm_init(padapter); rtw_hal_dm_init(padapter);