staging: rtl8188eu:Remove rtw_zmalloc(), wrapper for kzalloc()
PATCH 17/42 staging: rtl8188eu:Remove rtw_zmalloc(), wrapper for kzalloc()
--- drivers/staging/rtl8188eu/core/rtw_cmd.c | 124 ++++++++++----------- drivers/staging/rtl8188eu/core/rtw_efuse.c | 4 +- drivers/staging/rtl8188eu/core/rtw_mlme.c | 8 +- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 28 ++--- drivers/staging/rtl8188eu/core/rtw_mp.c | 2 +- drivers/staging/rtl8188eu/core/rtw_p2p.c | 8 +- drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8188eu/core/rtw_xmit.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 2 +- drivers/staging/rtl8188eu/hal/usb_halinit.c | 2 +- drivers/staging/rtl8188eu/include/osdep_service.h | 2 - drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 24 ++-- drivers/staging/rtl8188eu/os_dep/osdep_service.c | 11 +- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 4 +- drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 2 +- 16 files changed, 108 insertions(+), 119 deletions(-)
drivers/staging/rtl8188eu/core/rtw_cmd.c +62 -62
@@ -47,7 +47,7 @@ int _rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) pcmdpriv->cmd_seq =1 ; - pcmdpriv->cmd_allocated_buf =rtw_zmalloc (MAX_CMDSZ +CMDBUFF_ALIGN_SZ ); + pcmdpriv->cmd_allocated_buf =kzalloc (MAX_CMDSZ +CMDBUFF_ALIGN_SZ ,GFP_KERNEL );if (pcmdpriv->cmd_allocated_buf ==NULL ) { res = _FAIL;
@@ -56,7 +56,7 @@ int _rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) pcmdpriv->cmd_buf = pcmdpriv->cmd_allocated_buf +CMDBUFF_ALIGN_SZ - ((size_t )(pcmdpriv->cmd_allocated_buf) & (CMDBUFF_ALIGN_SZ -1 )); - pcmdpriv->rsp_allocated_buf =rtw_zmalloc (MAX_RSPSZ +4 ); + pcmdpriv->rsp_allocated_buf =kzalloc (MAX_RSPSZ +4 ,GFP_KERNEL );if (pcmdpriv->rsp_allocated_buf ==NULL ) { res = _FAIL;
@@ -437,11 +437,11 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid,if (check_fwstate (pmlmepriv, _FW_LINKED) == true)p2p_ps_wk_cmd (padapter,P2P_PS_SCAN ,1 ); - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL )return _FAIL; - psurveyPara = (struct sitesurvey_parm *)rtw_zmalloc (sizeof (struct sitesurvey_parm )); + psurveyPara =kzalloc (sizeof (struct sitesurvey_parm ),GFP_KERNEL );if (psurveyPara ==NULL ) {kfree (ph2c);return _FAIL;
@@ -506,13 +506,13 @@ u8 rtw_setdatarate_cmd(struct adapter *padapter, u8 *rateset)u8 res = _SUCCESS; - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = _FAIL; goto exit; } - pbsetdataratepara = (struct setdatarate_parm *)rtw_zmalloc (sizeof (struct setdatarate_parm )); + pbsetdataratepara =kzalloc (sizeof (struct setdatarate_parm ),GFP_KERNEL );if (pbsetdataratepara ==NULL ) {kfree (ph2c); res = _FAIL;
@@ -537,12 +537,12 @@ u8 rtw_setbasicrate_cmd(struct adapter *padapter, u8 *rateset)u8 res = _SUCCESS; - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = _FAIL; goto exit; } - pssetbasicratepara = (struct setbasicrate_parm *)rtw_zmalloc (sizeof (struct setbasicrate_parm )); + pssetbasicratepara =kzalloc (sizeof (struct setbasicrate_parm ),GFP_KERNEL );if (pssetbasicratepara ==NULL ) {kfree (ph2c);
@@ -577,12 +577,12 @@ u8 rtw_setphy_cmd(struct adapter *padapter, u8 modem, u8 ch)u8 res = _SUCCESS; - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = _FAIL; goto exit; } - psetphypara = (struct setphy_parm *)rtw_zmalloc (sizeof (struct setphy_parm )); + psetphypara =kzalloc (sizeof (struct setphy_parm ),GFP_KERNEL );if (psetphypara ==NULL ) {kfree (ph2c);
@@ -609,12 +609,12 @@ u8 rtw_setbbreg_cmd(struct adapter *padapter, u8 offset, u8 val)struct cmd_priv *pcmdpriv = &padapter->cmdpriv;u8 res = _SUCCESS; - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = _FAIL; goto exit; } - pwritebbparm = (struct writeBB_parm *)rtw_zmalloc (sizeof (struct writeBB_parm )); + pwritebbparm =kzalloc (sizeof (struct writeBB_parm ),GFP_KERNEL );if (pwritebbparm ==NULL ) {kfree (ph2c);
@@ -639,12 +639,12 @@ u8 rtw_getbbreg_cmd(struct adapter *padapter, u8 offset, u8 *pval)struct cmd_priv *pcmdpriv = &padapter->cmdpriv;u8 res = _SUCCESS; - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = _FAIL; goto exit; } - prdbbparm = (struct readBB_parm *)rtw_zmalloc (sizeof (struct readBB_parm )); + prdbbparm =kzalloc (sizeof (struct readBB_parm ),GFP_KERNEL );if (prdbbparm ==NULL ) {kfree (ph2c);
@@ -671,12 +671,12 @@ u8 rtw_setrfreg_cmd(struct adapter *padapter, u8 offset, u32 val)struct writeRF_parm *pwriterfparm;struct cmd_priv *pcmdpriv = &padapter->cmdpriv;u8 res = _SUCCESS; - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = _FAIL; goto exit; } - pwriterfparm = (struct writeRF_parm *)rtw_zmalloc (sizeof (struct writeRF_parm )); + pwriterfparm =kzalloc (sizeof (struct writeRF_parm ),GFP_KERNEL );if (pwriterfparm ==NULL ) {kfree (ph2c);
@@ -702,13 +702,13 @@ u8 rtw_getrfreg_cmd(struct adapter *padapter, u8 offset, u8 *pval)u8 res = _SUCCESS; - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = _FAIL; goto exit; } - prdrfparm = (struct readRF_parm *)rtw_zmalloc (sizeof (struct readRF_parm )); + prdrfparm =kzalloc (sizeof (struct readRF_parm ),GFP_KERNEL );if (prdrfparm ==NULL ) {kfree (ph2c); res = _FAIL;
@@ -768,7 +768,7 @@ u8 rtw_createbss_cmd(struct adapter *padapter)else RT_TRACE (_module_rtl871x_cmd_c_, _drv_info_, (" createbss for SSid:%s\n" , pmlmepriv->assoc_ssid.Ssid)); - pcmd = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + pcmd =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (pcmd ==NULL ) { res = _FAIL; goto exit;
@@ -795,7 +795,7 @@ u8 rtw_createbss_cmd_ex(struct adapter *padapter, unsigned char *pbss, unsignedu8 res = _SUCCESS; - pcmd = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + pcmd =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (pcmd ==NULL ) { res = _FAIL; goto exit;
@@ -840,7 +840,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork)else RT_TRACE (_module_rtl871x_cmd_c_, _drv_notice_, ("+Join cmd: SSid =[%s]\n" , pmlmepriv->assoc_ssid.Ssid)); - pcmd = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + pcmd =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (pcmd ==NULL ) { res = _FAIL;RT_TRACE (_module_rtl871x_cmd_c_, _drv_err_, ("rtw_joinbss_cmd: memory allocate for cmd_obj fail!!!\n" ));
@@ -969,7 +969,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueuRT_TRACE (_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_disassoc_cmd\n" ));/* prepare cmd parameter */ - param = (struct disconnect_parm *)rtw_zmalloc (sizeof (*param)); + param =kzalloc (sizeof (*param),GFP_KERNEL );if (param ==NULL ) { res = _FAIL; goto exit;
@@ -978,7 +978,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueuif (enqueue) {/* need enqueue, prepare cmd_obj and enqueue */ - cmdobj = (struct cmd_obj *)rtw_zmalloc (sizeof (*cmdobj)); + cmdobj =kzalloc (sizeof (*cmdobj),GFP_KERNEL );if (cmdobj ==NULL ) { res = _FAIL;kfree (param);
@@ -1008,12 +1008,12 @@ u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_network_infra nu8 res = _SUCCESS; - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = false; goto exit; } - psetop = (struct setopmode_parm *)rtw_zmalloc (sizeof (struct setopmode_parm )); + psetop =kzalloc (sizeof (struct setopmode_parm ),GFP_KERNEL );if (psetop ==NULL ) {kfree (ph2c);
@@ -1045,20 +1045,20 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key)u8 res = _SUCCESS; - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = _FAIL; goto exit; } - psetstakey_para = (struct set_stakey_parm *)rtw_zmalloc (sizeof (struct set_stakey_parm )); + psetstakey_para =kzalloc (sizeof (struct set_stakey_parm ),GFP_KERNEL );if (psetstakey_para ==NULL ) {kfree (ph2c); res = _FAIL; goto exit; } - psetstakey_rsp = (struct set_stakey_rsp *)rtw_zmalloc (sizeof (struct set_stakey_rsp )); + psetstakey_rsp =kzalloc (sizeof (struct set_stakey_rsp ),GFP_KERNEL );if (psetstakey_rsp ==NULL ) {kfree (ph2c);kfree (psetstakey_para);
@@ -1106,20 +1106,20 @@ u8 rtw_clearstakey_cmd(struct adapter *padapter, u8 *psta, u8 entry, u8 enqueue)if (!enqueue) {clear_cam_entry (padapter, entry); }else { - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = _FAIL; goto exit; } - psetstakey_para = (struct set_stakey_parm *)rtw_zmalloc (sizeof (struct set_stakey_parm )); + psetstakey_para =kzalloc (sizeof (struct set_stakey_parm ),GFP_KERNEL );if (psetstakey_para ==NULL ) {kfree (ph2c); res = _FAIL; goto exit; } - psetstakey_rsp = (struct set_stakey_rsp *)rtw_zmalloc (sizeof (struct set_stakey_rsp )); + psetstakey_rsp =kzalloc (sizeof (struct set_stakey_rsp ),GFP_KERNEL );if (psetstakey_rsp ==NULL ) {kfree (ph2c);kfree (psetstakey_para);
@@ -1152,12 +1152,12 @@ u8 rtw_setrttbl_cmd(struct adapter *padapter, struct setratable_parm *prate_tabstruct cmd_priv *pcmdpriv = &padapter->cmdpriv;u8 res = _SUCCESS; - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = _FAIL; goto exit; } - psetrttblparm = (struct setratable_parm *)rtw_zmalloc (sizeof (struct setratable_parm )); + psetrttblparm =kzalloc (sizeof (struct setratable_parm ),GFP_KERNEL );if (psetrttblparm ==NULL ) {kfree (ph2c);
@@ -1181,12 +1181,12 @@ u8 rtw_getrttbl_cmd(struct adapter *padapter, struct getratable_rsp *pval)struct cmd_priv *pcmdpriv = &padapter->cmdpriv;u8 res = _SUCCESS; - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = _FAIL; goto exit; } - pgetrttblparm = (struct getratable_parm *)rtw_zmalloc (sizeof (struct getratable_parm )); + pgetrttblparm =kzalloc (sizeof (struct getratable_parm ),GFP_KERNEL );if (pgetrttblparm ==NULL ) {kfree (ph2c);
@@ -1218,20 +1218,20 @@ u8 rtw_setassocsta_cmd(struct adapter *padapter, u8 *mac_addr)u8 res = _SUCCESS; - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = _FAIL; goto exit; } - psetassocsta_para = (struct set_assocsta_parm *)rtw_zmalloc (sizeof (struct set_assocsta_parm )); + psetassocsta_para =kzalloc (sizeof (struct set_assocsta_parm ),GFP_KERNEL );if (psetassocsta_para ==NULL ) {kfree (ph2c); res = _FAIL; goto exit; } - psetassocsta_rsp = (struct set_stakey_rsp *)rtw_zmalloc (sizeof (struct set_assocsta_rsp )); + psetassocsta_rsp =kzalloc (sizeof (struct set_assocsta_rsp ),GFP_KERNEL );if (psetassocsta_rsp ==NULL ) {kfree (ph2c);kfree (psetassocsta_para);
@@ -1260,13 +1260,13 @@ u8 rtw_addbareq_cmd(struct adapter *padapter, u8 tid, u8 *addr)u8 res = _SUCCESS; - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = _FAIL; goto exit; } - paddbareq_parm = (struct addBaReq_parm *)rtw_zmalloc (sizeof (struct addBaReq_parm )); + paddbareq_parm =kzalloc (sizeof (struct addBaReq_parm ),GFP_KERNEL );if (paddbareq_parm ==NULL ) {kfree (ph2c); res = _FAIL;
@@ -1297,13 +1297,13 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *padapter)u8 res = _SUCCESS; - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = _FAIL; goto exit; } - pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc (sizeof (struct drvextra_cmd_parm )); + pdrvextra_cmd_parm =kzalloc (sizeof (struct drvextra_cmd_parm ),GFP_KERNEL );if (pdrvextra_cmd_parm ==NULL ) {kfree (ph2c); res = _FAIL;
@@ -1338,7 +1338,7 @@ u8 rtw_set_ch_cmd(struct adapter *padapter, u8 ch, u8 bw, u8 ch_offset, u8 enque/* check input parameter */ /* prepare cmd parameter */ - set_ch_parm = (struct set_ch_parm *)rtw_zmalloc (sizeof (*set_ch_parm)); + set_ch_parm =kzalloc (sizeof (*set_ch_parm),GFP_KERNEL );if (set_ch_parm ==NULL ) { res = _FAIL; goto exit;
@@ -1349,7 +1349,7 @@ u8 rtw_set_ch_cmd(struct adapter *padapter, u8 ch, u8 bw, u8 ch_offset, u8 enqueif (enqueue) {/* need enqueue, prepare cmd_obj and enqueue */ - pcmdobj = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + pcmdobj =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (pcmdobj ==NULL ) {kfree (set_ch_parm); res = _FAIL;
@@ -1394,7 +1394,7 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue) }/* prepare cmd parameter */ - setChannelPlan_param = (struct SetChannelPlan_param *)rtw_zmalloc (sizeof (struct SetChannelPlan_param )); + setChannelPlan_param =kzalloc (sizeof (struct SetChannelPlan_param ),GFP_KERNEL );if (setChannelPlan_param ==NULL ) { res = _FAIL; goto exit;
@@ -1403,7 +1403,7 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue)if (enqueue) {/* need enqueue, prepare cmd_obj and enqueue */ - pcmdobj = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + pcmdobj =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (pcmdobj ==NULL ) {kfree (setChannelPlan_param); res = _FAIL;
@@ -1441,13 +1441,13 @@ u8 rtw_set_csa_cmd(struct adapter *padapter, u8 new_ch_no)RT_TRACE (_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_set_csa_cmd\n" )); - pcmdobj = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + pcmdobj =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (pcmdobj ==NULL ) { res = _FAIL; goto exit; } - setChannelSwitch_param = (struct SetChannelSwitch_param *)rtw_zmalloc (sizeof (struct SetChannelSwitch_param )); + setChannelSwitch_param =kzalloc (sizeof (struct SetChannelSwitch_param ),GFP_KERNEL );if (setChannelSwitch_param ==NULL ) {kfree (pcmdobj); res = _FAIL;
@@ -1602,13 +1602,13 @@ u8 rtw_lps_ctrl_wk_cmd(struct adapter *padapter, u8 lps_ctrl_type, u8 enqueue)u8 res = _SUCCESS;if (enqueue) { - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = _FAIL; goto exit; } - pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc (sizeof (struct drvextra_cmd_parm )); + pdrvextra_cmd_parm =kzalloc (sizeof (struct drvextra_cmd_parm ),GFP_KERNEL );if (pdrvextra_cmd_parm ==NULL ) {kfree (ph2c); res = _FAIL;
@@ -1645,13 +1645,13 @@ u8 rtw_rpt_timer_cfg_cmd(struct adapter *padapter, u16 min_time)u8 res = _SUCCESS; - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = _FAIL; goto exit; } - pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc (sizeof (struct drvextra_cmd_parm )); + pdrvextra_cmd_parm =kzalloc (sizeof (struct drvextra_cmd_parm ),GFP_KERNEL );if (pdrvextra_cmd_parm ==NULL ) {kfree (ph2c); res = _FAIL;
@@ -1687,13 +1687,13 @@ u8 rtw_antenna_select_cmd(struct adapter *padapter, u8 antenna, u8 enqueue)return res;if (enqueue) { - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = _FAIL; goto exit; } - pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc (sizeof (struct drvextra_cmd_parm )); + pdrvextra_cmd_parm =kzalloc (sizeof (struct drvextra_cmd_parm ),GFP_KERNEL );if (pdrvextra_cmd_parm ==NULL ) {kfree (ph2c); res = _FAIL;
@@ -1733,13 +1733,13 @@ u8 p2p_protocol_wk_cmd(struct adapter *padapter, int intCmdType)if (rtw_p2p_chk_state (pwdinfo,P2P_STATE_NONE ))return res; - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = _FAIL; goto exit; } - pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc (sizeof (struct drvextra_cmd_parm )); + pdrvextra_cmd_parm =kzalloc (sizeof (struct drvextra_cmd_parm ),GFP_KERNEL );if (pdrvextra_cmd_parm ==NULL ) {kfree (ph2c); res = _FAIL;
@@ -1769,13 +1769,13 @@ u8 rtw_ps_cmd(struct adapter *padapter)u8 res = _SUCCESS; - ppscmd = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ppscmd =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ppscmd ==NULL ) { res = _FAIL; goto exit; } - pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc (sizeof (struct drvextra_cmd_parm )); + pdrvextra_cmd_parm =kzalloc (sizeof (struct drvextra_cmd_parm ),GFP_KERNEL );if (pdrvextra_cmd_parm ==NULL ) {kfree (ppscmd); res = _FAIL;
@@ -1843,13 +1843,13 @@ u8 rtw_chk_hi_queue_cmd(struct adapter *padapter)struct cmd_priv *pcmdpriv = &padapter->cmdpriv;u8 res = _SUCCESS; - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = _FAIL; goto exit; } - pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc (sizeof (struct drvextra_cmd_parm )); + pdrvextra_cmd_parm =kzalloc (sizeof (struct drvextra_cmd_parm ),GFP_KERNEL );if (pdrvextra_cmd_parm ==NULL ) {kfree (ph2c); res = _FAIL;
@@ -1875,13 +1875,13 @@ u8 rtw_c2h_wk_cmd(struct adapter *padapter, u8 *c2h_evt)struct cmd_priv *pcmdpriv = &padapter->cmdpriv;u8 res = _SUCCESS; - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = _FAIL; goto exit; } - pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc (sizeof (struct drvextra_cmd_parm )); + pdrvextra_cmd_parm =kzalloc (sizeof (struct drvextra_cmd_parm ),GFP_KERNEL );if (pdrvextra_cmd_parm ==NULL ) {kfree (ph2c); res = _FAIL;
drivers/staging/rtl8188eu/core/rtw_efuse.c +2 -2
@@ -103,7 +103,7 @@ efuse_phymap_to_logical(u8 *phymap, u16 _offset, u16 _size_byte, u8 *pbuf)u16 efuse_utilized =0 ;u8 u1temp =0 ; - efuseTbl = (u8 *)rtw_zmalloc (EFUSE_MAP_LEN_88E ); + efuseTbl =kzalloc (EFUSE_MAP_LEN_88E ,GFP_KERNEL );if (efuseTbl ==NULL ) {DBG_88E ("%s: alloc efuseTbl fail!\n" , __func__); goto exit;
@@ -1083,7 +1083,7 @@ u8 rtw_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data)if ((addr + cnts) > mapLen)return _FAIL; - map =rtw_zmalloc (mapLen); + map =kzalloc (mapLen,GFP_KERNEL );if (map ==NULL )return _FAIL;
drivers/staging/rtl8188eu/core/rtw_mlme.c +4 -4
@@ -1666,13 +1666,13 @@ int rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv)struct cmd_priv *pcmdpriv = &(adapter->cmdpriv);int res = _SUCCESS; - pcmd = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + pcmd =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (pcmd ==NULL ) { res = _FAIL;/* try again */ goto exit; } - psetauthparm = (struct setauth_parm *)rtw_zmalloc (sizeof (struct setauth_parm )); + psetauthparm =kzalloc (sizeof (struct setauth_parm ),GFP_KERNEL );if (psetauthparm ==NULL ) {kfree (pcmd); res = _FAIL;
@@ -1703,11 +1703,11 @@ int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, instruct mlme_priv *pmlmepriv = &(adapter->mlmepriv);int res = _SUCCESS; - pcmd = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + pcmd =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (pcmd ==NULL )return _FAIL;/* try again */ - psetkeyparm = (struct setkey_parm *)rtw_zmalloc (sizeof (struct setkey_parm )); + psetkeyparm =kzalloc (sizeof (struct setkey_parm ),GFP_KERNEL );if (psetkeyparm ==NULL ) { res = _FAIL; goto err_free_cmd;
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +14 -14
@@ -7055,12 +7055,12 @@ void report_survey_event(struct adapter *padapter, pcmdpriv = &padapter->cmdpriv; - pcmd_obj = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + pcmd_obj =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (pcmd_obj ==NULL )return ; cmdsz = (sizeof (struct survey_event ) +sizeof (struct C2HEvent_Header )); - pevtcmd = (u8 *)rtw_zmalloc (cmdsz); + pevtcmd =kzalloc (cmdsz,GFP_KERNEL );if (pevtcmd ==NULL ) {kfree (pcmd_obj);return ;
@@ -7107,12 +7107,12 @@ void report_surveydone_event(struct adapter *padapter)struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct cmd_priv *pcmdpriv = &padapter->cmdpriv; - pcmd_obj = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + pcmd_obj =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (pcmd_obj ==NULL )return ; cmdsz = (sizeof (struct surveydone_event ) +sizeof (struct C2HEvent_Header )); - pevtcmd = (u8 *)rtw_zmalloc (cmdsz); + pevtcmd =kzalloc (cmdsz,GFP_KERNEL );if (pevtcmd ==NULL ) {kfree (pcmd_obj);return ;
@@ -7153,12 +7153,12 @@ void report_join_res(struct adapter *padapter, int res)struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);struct cmd_priv *pcmdpriv = &padapter->cmdpriv; - pcmd_obj = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + pcmd_obj =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (pcmd_obj ==NULL )return ; cmdsz = (sizeof (struct joinbss_event ) +sizeof (struct C2HEvent_Header )); - pevtcmd = (u8 *)rtw_zmalloc (cmdsz); + pevtcmd =kzalloc (cmdsz,GFP_KERNEL );if (pevtcmd ==NULL ) {kfree (pcmd_obj);return ;
@@ -7206,12 +7206,12 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsistruct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct cmd_priv *pcmdpriv = &padapter->cmdpriv; - pcmd_obj = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + pcmd_obj =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (pcmd_obj ==NULL )return ; cmdsz = (sizeof (struct stadel_event ) +sizeof (struct C2HEvent_Header )); - pevtcmd = (u8 *)rtw_zmalloc (cmdsz); + pevtcmd =kzalloc (cmdsz,GFP_KERNEL );if (pevtcmd ==NULL ) {kfree (pcmd_obj);return ;
@@ -7261,12 +7261,12 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, intstruct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct cmd_priv *pcmdpriv = &padapter->cmdpriv; - pcmd_obj = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + pcmd_obj =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (pcmd_obj ==NULL )return ; cmdsz = (sizeof (struct stassoc_event ) +sizeof (struct C2HEvent_Header )); - pevtcmd = (u8 *)rtw_zmalloc (cmdsz); + pevtcmd =kzalloc (cmdsz,GFP_KERNEL );if (pevtcmd ==NULL ) {kfree (pcmd_obj);return ;
@@ -7686,11 +7686,11 @@ void survey_timer_hdl(struct adapter *padapter) pmlmeext->scan_abort = false;/* reset */ } - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) goto exit_survey_timer_hdl; - psurveyPara = (struct sitesurvey_parm *)rtw_zmalloc (sizeof (struct sitesurvey_parm )); + psurveyPara =kzalloc (sizeof (struct sitesurvey_parm ),GFP_KERNEL );if (psurveyPara ==NULL ) {kfree (ph2c); goto exit_survey_timer_hdl;
@@ -8268,13 +8268,13 @@ u8 set_tx_beacon_cmd(struct adapter *padapter)int len_diff =0 ; - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = _FAIL; goto exit; } - ptxBeacon_parm = (struct Tx_Beacon_param *)rtw_zmalloc (sizeof (struct Tx_Beacon_param )); + ptxBeacon_parm =kzalloc (sizeof (struct Tx_Beacon_param ),GFP_KERNEL );if (ptxBeacon_parm ==NULL ) {kfree (ph2c); res = _FAIL;
drivers/staging/rtl8188eu/core/rtw_mp.c +1 -1
@@ -687,7 +687,7 @@ void SetPacketTx(struct adapter *padapter)kfree (pmp_priv->tx.pallocated_buf); pmp_priv->tx.write_size = pkt_size; pmp_priv->tx.buf_size = pkt_size +XMITBUF_ALIGN_SZ ; - pmp_priv->tx.pallocated_buf =rtw_zmalloc (pmp_priv->tx.buf_size); + pmp_priv->tx.pallocated_buf =kzalloc (pmp_priv->tx.buf_size,GFP_KERNEL );if (pmp_priv->tx.pallocated_buf ==NULL ) {DBG_88E ("%s: malloc(%d) fail!!\n" , __func__, pmp_priv->tx.buf_size);return ;
drivers/staging/rtl8188eu/core/rtw_p2p.c +4 -4
@@ -50,7 +50,7 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf)DBG_88E ("%s\n" , __func__); - pdata_attr =rtw_zmalloc (MAX_P2P_IE_LEN ); + pdata_attr =kzalloc (MAX_P2P_IE_LEN ,GFP_KERNEL ); pstart = pdata_attr; pcur = pdata_attr;
@@ -891,7 +891,7 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l/* Check P2P Device Info ATTR */ if (rtw_get_p2p_attr_content (p2p_ie, p2p_ielen,P2P_ATTR_DEVICE_INFO ,NULL , (uint *)&attr_contentlen)) {DBG_88E ("[%s] Got P2P DEVICE INFO Attr!!\n" , __func__); - pattr_content =rtw_zmalloc (attr_contentlen); + pattr_content =kzalloc (attr_contentlen,GFP_KERNEL ); pbuf = pattr_content;if (pattr_content) {u8 num_of_secdev_type;
@@ -1738,13 +1738,13 @@ u8 p2p_ps_wk_cmd(struct adapter *padapter, u8 p2p_ps_state, u8 enqueue)return res;if (enqueue) { - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = _FAIL; goto exit; } - pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc (sizeof (struct drvextra_cmd_parm )); + pdrvextra_cmd_parm =kzalloc (sizeof (struct drvextra_cmd_parm ),GFP_KERNEL );if (pdrvextra_cmd_parm ==NULL ) {kfree (ph2c); res = _FAIL;
drivers/staging/rtl8188eu/core/rtw_wlan_util.c +1 -1
@@ -935,7 +935,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)return true; } - bssid = (struct wlan_bssid_ex *)rtw_zmalloc (sizeof (struct wlan_bssid_ex )); + bssid =kzalloc (sizeof (struct wlan_bssid_ex ),GFP_KERNEL ); subtype =GetFrameSubType (pframe) >>4 ;
drivers/staging/rtl8188eu/core/rtw_xmit.c +1 -1
@@ -1637,7 +1637,7 @@ void rtw_alloc_hwxmits(struct adapter *padapter) pxmitpriv->hwxmit_entry =HWXMIT_ENTRY ; - pxmitpriv->hwxmits = (struct hw_xmit *)rtw_zmalloc (sizeof (struct hw_xmit ) * pxmitpriv->hwxmit_entry); + pxmitpriv->hwxmits =kzalloc (sizeof (struct hw_xmit ) * pxmitpriv->hwxmit_entry,GFP_KERNEL ); hwxmits = pxmitpriv->hwxmits;
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c +1 -1
@@ -503,7 +503,7 @@ static void SetFwRsvdPagePkt(struct adapter *adapt, bool bDLFinished)struct rsvdpage_loc RsvdPageLoc;DBG_88E ("%s\n" , __func__); - ReservedPagePacket = (u8 *)rtw_zmalloc (1000 ); + ReservedPagePacket =kzalloc (1000 ,GFP_KERNEL );if (ReservedPagePacket ==NULL ) {DBG_88E ("%s: alloc ReservedPagePacket fail!\n" , __func__);return ;
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c +1 -1
@@ -41,7 +41,7 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter)/* init recv_buf */ _rtw_init_queue (&precvpriv->free_recv_buf_queue); - precvpriv->pallocated_recv_buf =rtw_zmalloc (NR_RECVBUFF *sizeof (struct recv_buf ) +4 ); + precvpriv->pallocated_recv_buf =kzalloc (NR_RECVBUFF *sizeof (struct recv_buf ) +4 ,GFP_KERNEL );if (precvpriv->pallocated_recv_buf ==NULL ) { res = _FAIL;RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("alloc recv_buf fail!\n" ));
drivers/staging/rtl8188eu/hal/usb_halinit.c +1 -1
@@ -2211,7 +2211,7 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)struct hal_ops *halfunc = &adapt->HalFunc; - adapt->HalData =rtw_zmalloc (sizeof (struct hal_data_8188e )); + adapt->HalData =kzalloc (sizeof (struct hal_data_8188e ),GFP_KERNEL );if (adapt->HalData ==NULL )DBG_88E ("cant not alloc memory for HAL DATA\n" );
drivers/staging/rtl8188eu/include/osdep_service.h +0 -2
@@ -188,11 +188,9 @@ extern unsigned char WPA_TKIP_CIPHER[4];extern unsigned char RSN_TKIP_CIPHER [4 ];#define rtw_update_mem_stat (flag, sz) do {} while (0) -u8 *_rtw_zmalloc (u32 sz);u8 *_rtw_malloc (u32 sz);void _rtw_mfree (u8 *pbuf,u32 sz);#define rtw_malloc (sz) _rtw_malloc((sz)) -#define rtw_zmalloc (sz) _rtw_zmalloc((sz))#define rtw_mfree (pbuf, sz) _rtw_mfree((pbuf), (sz))void *rtw_malloc2d (int h,int w,int size);
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +12 -12
@@ -632,7 +632,7 @@ static int rtw_set_wpa_ie(struct adapter *padapter, char *pie, unsigned short ie }if (ielen) { - buf =rtw_zmalloc (ielen); + buf =kzalloc (ielen,GFP_KERNEL );if (buf ==NULL ) { ret = -ENOMEM ; goto exit;
@@ -4721,13 +4721,13 @@ static u8 set_pairwise_key(struct adapter *padapter, struct sta_info *psta)struct cmd_priv *pcmdpriv = &padapter->cmdpriv;u8 res = _SUCCESS; - ph2c = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + ph2c =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (ph2c ==NULL ) { res = _FAIL; goto exit; } - psetstakey_para = (struct set_stakey_parm *)rtw_zmalloc (sizeof (struct set_stakey_parm )); + psetstakey_para =kzalloc (sizeof (struct set_stakey_parm ),GFP_KERNEL );if (psetstakey_para ==NULL ) {kfree (ph2c); res = _FAIL;
@@ -4759,12 +4759,12 @@ static int set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid)DBG_88E ("%s\n" , __func__); - pcmd = (struct cmd_obj *)rtw_zmalloc (sizeof (struct cmd_obj )); + pcmd =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (pcmd ==NULL ) { res = _FAIL; goto exit; } - psetkeyparm = (struct setkey_parm *)rtw_zmalloc (sizeof (struct setkey_parm )); + psetkeyparm =kzalloc (sizeof (struct setkey_parm ),GFP_KERNEL );if (psetkeyparm ==NULL ) {kfree (pcmd); res = _FAIL;
@@ -5672,12 +5672,12 @@ static int rtw_mp_efuse_get(struct net_device *dev, pEfuseHal = &haldata->EfuseHal; err =0 ; - data =_rtw_zmalloc (EFUSE_BT_MAX_MAP_LEN ); + data =kzalloc (EFUSE_BT_MAX_MAP_LEN ,GFP_KERNEL );if (data ==NULL ) { err = -ENOMEM ; goto exit; } - rawdata =_rtw_zmalloc (EFUSE_BT_MAX_MAP_LEN ); + rawdata =kzalloc (EFUSE_BT_MAX_MAP_LEN ,GFP_KERNEL );if (rawdata ==NULL ) { err = -ENOMEM ; goto exit;
@@ -5916,7 +5916,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, haldata =GET_HAL_DATA (padapter); pEfuseHal = &haldata->EfuseHal; err =0 ; - setdata =_rtw_zmalloc (1024 ); + setdata =kzalloc (1024 ,GFP_KERNEL );if (setdata ==NULL ) { err = -ENOMEM ; goto exit;
@@ -7438,7 +7438,7 @@ static int rtw_test(DBG_88E ("+%s\n" , __func__); len = wrqu->data.length; - pbuf = (u8 *)rtw_zmalloc (len); + pbuf =kzalloc (len,GFP_KERNEL );if (pbuf ==NULL ) {DBG_88E ("%s: no memory!\n" , __func__);return -ENOMEM ;
@@ -7783,7 +7783,7 @@ static int rtw_ioctl_wext_private(struct net_device *dev, union iwreq_data *wrq_memcpy (&wdata, wrq_data,sizeof (wdata)); input_len = wdata.data.length; - input =rtw_zmalloc (input_len); + input =kzalloc (input_len,GFP_KERNEL );if (NULL == input)return -ENOMEM ;if (copy_from_user (input, wdata.data.pointer, input_len)) {
@@ -7850,7 +7850,7 @@ static int rtw_ioctl_wext_private(struct net_device *dev, union iwreq_data *wrq_ k = j; } - buffer =rtw_zmalloc (4096 ); + buffer =kzalloc (4096 ,GFP_KERNEL );if (NULL == buffer) { err = -ENOMEM ; goto exit;
@@ -7999,7 +7999,7 @@ static int rtw_ioctl_wext_private(struct net_device *dev, union iwreq_data *wrq_else n = wdata.data.length; - output =rtw_zmalloc (4096 ); + output =kzalloc (4096 ,GFP_KERNEL );if (NULL == output) { err = -ENOMEM ; goto exit;
drivers/staging/rtl8188eu/os_dep/osdep_service.c +1 -10
@@ -47,20 +47,11 @@ u8 *_rtw_malloc(u32 sz)return pbuf; } -u8 *_rtw_zmalloc (u32 sz) -{ -u8 *pbuf =_rtw_malloc (sz); - -if (pbuf !=NULL ) -memset (pbuf,0 , sz); -return pbuf; -} -void *rtw_malloc2d (int h,int w,int size) {int j; -void **a = (void **)rtw_zmalloc (h*sizeof (void *) + h*w*size); +void **a = (void **)kzalloc (h*sizeof (void *) + h*w*size,GFP_KERNEL );if (a ==NULL ) {pr_info ("%s: alloc memory fail!\n" , __func__);return NULL ;
drivers/staging/rtl8188eu/os_dep/usb_intf.c +2 -2
@@ -66,7 +66,7 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf)struct usb_device *pusbd; - pdvobjpriv = (struct dvobj_priv *)rtw_zmalloc (sizeof (*pdvobjpriv)); + pdvobjpriv =kzalloc (sizeof (*pdvobjpriv),GFP_KERNEL );if (pdvobjpriv ==NULL ) goto exit;
@@ -116,7 +116,7 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf) pdvobjpriv->ishighspeed = false;mutex_init (&pdvobjpriv->usb_vendor_req_mutex); - pdvobjpriv->usb_vendor_req_buf =rtw_zmalloc (MAX_USB_IO_CTL_SIZE ); + pdvobjpriv->usb_vendor_req_buf =kzalloc (MAX_USB_IO_CTL_SIZE ,GFP_KERNEL );if (!pdvobjpriv->usb_vendor_req_buf) goto free_dvobj;
drivers/staging/rtl8188eu/os_dep/xmit_linux.c +1 -1
@@ -81,7 +81,7 @@ int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitb {int i; - pxmitbuf->pallocated_buf =rtw_zmalloc (alloc_sz); + pxmitbuf->pallocated_buf =kzalloc (alloc_sz,GFP_KERNEL );if (pxmitbuf->pallocated_buf ==NULL )return _FAIL;
Signature · 1 line
1.7.10.4
PATCH 18/42 staging: rtl8188eu: Remove unused function rtw_division64()
--- drivers/staging/rtl8188eu/include/osdep_service.h | 1 - drivers/staging/rtl8188eu/os_dep/osdep_service.c | 6 ------ 2 files changed, 7 deletions(-)
drivers/staging/rtl8188eu/include/osdep_service.h +0 -1
@@ -305,7 +305,6 @@ void rtw_free_netdev(struct net_device *netdev);#define rtw_signal_process (pid, sig) kill_pid(find_vpid((pid)), (sig), 1)u64 rtw_modular64 (u64 x,u64 y); -u64 rtw_division64 (u64 x,u64 y);/* Macros for handling unaligned memory accesses */
drivers/staging/rtl8188eu/os_dep/osdep_service.c +0 -6
@@ -225,12 +225,6 @@ u64 rtw_modular64(u64 x, u64 y)return do_div (x, y); } -u64 rtw_division64 (u64 x,u64 y) -{ -do_div (x, y); -return x; -} -void rtw_buf_free (u8 **buf,u32 *buf_len) { *buf_len =0 ;
Signature · 1 line
1.7.10.4
PATCH 19/42 staging: rtl8188eu: Remove unused function rtw_get_time_interval_ms()
In reply to navin patidar--- drivers/staging/rtl8188eu/include/osdep_service.h | 1 - drivers/staging/rtl8188eu/os_dep/osdep_service.c | 5 ----- 2 files changed, 6 deletions(-)
drivers/staging/rtl8188eu/include/osdep_service.h +0 -1
@@ -207,7 +207,6 @@ u32 _rtw_queue_empty(struct __queue *pqueue);u32 rtw_systime_to_ms (u32 systime);u32 rtw_ms_to_systime (u32 ms);s32 rtw_get_passing_time_ms (u32 start); -s32 rtw_get_time_interval_ms (u32 start,u32 end);static inline unsigned char _cancel_timer_ex (struct timer_list *ptimer) {
drivers/staging/rtl8188eu/os_dep/osdep_service.c +0 -5
@@ -98,11 +98,6 @@ inline s32 rtw_get_passing_time_ms(u32 start)return rtw_systime_to_ms (jiffies-start); } -inline s32 rtw_get_time_interval_ms (u32 start,u32 end) -{ -return rtw_systime_to_ms (end-start); -} -#define RTW_SUSPEND_LOCK_NAME "rtw_wifi" struct net_device *rtw_alloc_etherdev_with_old_priv(int sizeof_priv,
Signature · 1 line
1.7.10.4
PATCH 20/42 staging: rtl8188eu: osdep_service.h: Remove unused macro, enum and variables
In reply to navin patidar--- drivers/staging/rtl8188eu/include/osdep_service.h | 27 --------------------- 1 file changed, 27 deletions(-)
drivers/staging/rtl8188eu/include/osdep_service.h +0 -27
@@ -163,30 +163,6 @@ static inline int rtw_netif_queue_stopped(struct net_device *pnetdev)extern int RTW_STATUS_CODE (int error_code); -/* flags used for rtw_update_mem_stat() */ -enum { -MEM_STAT_VIR_ALLOC_SUCCESS , -MEM_STAT_VIR_ALLOC_FAIL , -MEM_STAT_VIR_FREE , -MEM_STAT_PHY_ALLOC_SUCCESS , -MEM_STAT_PHY_ALLOC_FAIL , -MEM_STAT_PHY_FREE , -MEM_STAT_TX ,/* used to distinguish TX/RX, asigned from caller */ -MEM_STAT_TX_ALLOC_SUCCESS , -MEM_STAT_TX_ALLOC_FAIL , -MEM_STAT_TX_FREE , -MEM_STAT_RX ,/* used to distinguish TX/RX, asigned from caller */ -MEM_STAT_RX_ALLOC_SUCCESS , -MEM_STAT_RX_ALLOC_FAIL , -MEM_STAT_RX_FREE -}; - -extern unsigned char MCS_rate_2R[16 ]; -extern unsigned char MCS_rate_1R[16 ]; -extern unsigned char RTW_WPA_OUI []; -extern unsigned char WPA_TKIP_CIPHER [4 ]; -extern unsigned char RSN_TKIP_CIPHER [4 ]; -#define rtw_update_mem_stat (flag, sz) do {} while (0)u8 *_rtw_malloc (u32 sz);void _rtw_mfree (u8 *pbuf,u32 sz);
@@ -277,9 +253,6 @@ static inline u32 bitshift(u32 bitmask)return i; } -/* limitation of path length */ -#define PATH_LENGTH_MAX PATH_MAX -struct rtw_netdev_priv_indicator {void *priv;u32 sizeof_priv;
Signature · 1 line
1.7.10.4
PATCH 21/42 staging: rtl8188eu: Replace rtw_list_delete() with list_del_init()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_ap.c | 12 +++---- drivers/staging/rtl8188eu/core/rtw_cmd.c | 2 +- drivers/staging/rtl8188eu/core/rtw_mlme.c | 10 +++--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 10 +++--- drivers/staging/rtl8188eu/core/rtw_recv.c | 14 ++++---- drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 16 ++++----- drivers/staging/rtl8188eu/core/rtw_xmit.c | 36 ++++++++++----------- drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 4 +-- drivers/staging/rtl8188eu/include/osdep_service.h | 7 ---- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 2 +- 10 files changed, 53 insertions(+), 60 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ap.c +6 -6
@@ -295,7 +295,7 @@ void expire_timeout_chk(struct adapter *padapter)if (psta->expire_to >0 ) { psta->expire_to--;if (psta->expire_to ==0 ) { -rtw_list_delete (&psta->auth_list); +list_del_init (&psta->auth_list); pstapriv->auth_list_cnt--; DBG_88E("auth expire %6ph\n",
@@ -365,7 +365,7 @@ void expire_timeout_chk(struct adapter *padapter)continue ; } -rtw_list_delete (&psta->asoc_list); +list_del_init (&psta->asoc_list); pstapriv->asoc_list_cnt--;DBG_88E ("asoc expire %pM, state = 0x%x\n" , (psta->hwaddr), psta->state);
@@ -421,7 +421,7 @@ void expire_timeout_chk(struct adapter *padapter)DBG_88E ("asoc expire %pM, state = 0x%x\n" , (psta->hwaddr), psta->state);spin_lock_bh (&pstapriv->asoc_list_lock); -rtw_list_delete (&psta->asoc_list); +list_del_init (&psta->asoc_list); pstapriv->asoc_list_cnt--; updated =ap_free_sta (padapter, psta, true,WLAN_REASON_DEAUTH_LEAVING );spin_unlock_bh (&pstapriv->asoc_list_lock);
@@ -1215,7 +1215,7 @@ int rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)if (paclnode->valid) { paclnode->valid = false; -rtw_list_delete (&paclnode->list); +list_del_init (&paclnode->list); pacl_list->num--; }
@@ -1818,7 +1818,7 @@ int rtw_sta_flush(struct adapter *padapter) plist = plist->next; -rtw_list_delete (&psta->asoc_list); +list_del_init (&psta->asoc_list); pstapriv->asoc_list_cnt--;ap_free_sta (padapter, psta, true,WLAN_REASON_DEAUTH_LEAVING );
@@ -1949,7 +1949,7 @@ void stop_ap_mode(struct adapter *padapter)if (paclnode->valid) { paclnode->valid = false; -rtw_list_delete (&paclnode->list); +list_del_init (&paclnode->list); pacl_list->num--; }
drivers/staging/rtl8188eu/core/rtw_cmd.c +1 -1
@@ -159,7 +159,7 @@ struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue) obj =NULL ; }else { obj = container_of((&queue->queue)->next, struct cmd_obj, list); -rtw_list_delete (&obj->list); +list_del_init (&obj->list); }spin_unlock_irqrestore (&queue->lock, irqL);
drivers/staging/rtl8188eu/core/rtw_mlme.c +5 -5
@@ -154,7 +154,7 @@ struct wlan_network *_rtw_dequeue_network(struct __queue *queue) }else { pnetwork = container_of((&queue->queue)->next, struct wlan_network, list); -rtw_list_delete (&(pnetwork->list)); +list_del_init (&(pnetwork->list)); }spin_unlock_bh (&queue->lock);
@@ -178,7 +178,7 @@ struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv)/* _queue *f pnetwork = container_of(plist , struct wlan_network, list); -rtw_list_delete (&pnetwork->list); +list_del_init (&pnetwork->list);RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("_rtw_alloc_network: ptr=%p\n" , plist)); pnetwork->network_type =0 ;
@@ -216,7 +216,7 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv , struct wlan_network *pnetworeturn ; }spin_lock_bh (&free_queue->lock); -rtw_list_delete (&(pnetwork->list)); +list_del_init (&(pnetwork->list));list_add_tail (&(pnetwork->list), &(free_queue->queue)); pmlmepriv->num_of_scanned--;spin_unlock_bh (&free_queue->lock);
@@ -230,7 +230,7 @@ void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *return ;if (pnetwork->fixed)return ; -rtw_list_delete (&(pnetwork->list)); +list_del_init (&(pnetwork->list));list_add_tail (&(pnetwork->list),get_list_head (free_queue)); pmlmepriv->num_of_scanned--; }
@@ -826,7 +826,7 @@ static void free_scanqueue(struct mlme_priv *pmlmepriv)while (plist != phead) { ptemp = plist->next; -rtw_list_delete (plist); +list_del_init (plist);list_add_tail (plist, &free_queue->queue); plist = ptemp; pmlmepriv->num_of_scanned--;
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +5 -5
@@ -818,7 +818,7 @@ unsigned int OnAuth(struct adapter *padapter, struct recv_frame *precv_frame) }else {spin_lock_bh (&pstapriv->asoc_list_lock);if (!list_empty (&pstat->asoc_list)) { -rtw_list_delete (&pstat->asoc_list); +list_del_init (&pstat->asoc_list); pstapriv->asoc_list_cnt--; }spin_unlock_bh (&pstapriv->asoc_list_lock);
@@ -1408,7 +1408,7 @@ unsigned int OnAssocReq(struct adapter *padapter, struct recv_frame *precv_framespin_lock_bh (&pstapriv->auth_list_lock);if (!list_empty (&pstat->auth_list)) { -rtw_list_delete (&pstat->auth_list); +list_del_init (&pstat->auth_list); pstapriv->auth_list_cnt--; }spin_unlock_bh (&pstapriv->auth_list_lock);
@@ -1601,7 +1601,7 @@ unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_frame)spin_lock_bh (&pstapriv->asoc_list_lock);if (!list_empty (&psta->asoc_list)) { -rtw_list_delete (&psta->asoc_list); +list_del_init (&psta->asoc_list); pstapriv->asoc_list_cnt--; updated =ap_free_sta (padapter, psta, false, reason); }
@@ -1665,7 +1665,7 @@ unsigned int OnDisassoc(struct adapter *padapter, struct recv_frame *precv_framespin_lock_bh (&pstapriv->asoc_list_lock);if (!list_empty (&psta->asoc_list)) { -rtw_list_delete (&psta->asoc_list); +list_del_init (&psta->asoc_list); pstapriv->asoc_list_cnt--; updated =ap_free_sta (padapter, psta, false, reason); }
@@ -8379,7 +8379,7 @@ u8 tx_beacon_hdl(struct adapter *padapter, unsigned char *pbuf) xmitframe_plist = xmitframe_plist->next; -rtw_list_delete (&pxmitframe->list); +list_del_init (&pxmitframe->list); psta_bmc->sleepq_len--;if (psta_bmc->sleepq_len >0 )
drivers/staging/rtl8188eu/core/rtw_recv.c +7 -7
@@ -140,7 +140,7 @@ struct recv_frame *_rtw_alloc_recvframe (struct __queue *pfree_recv_queue) hdr = container_of(plist, struct recv_frame, list); -rtw_list_delete (&hdr->list); +list_del_init (&hdr->list); padapter = hdr->adapter;if (padapter !=NULL ) { precvpriv = &padapter->recvpriv;
@@ -191,7 +191,7 @@ int rtw_free_recvframe(struct recv_frame *precvframe,spin_lock_bh (&pfree_recv_queue->lock); -rtw_list_delete (&(precvframe->list)); +list_del_init (&(precvframe->list)); precvframe->len =0 ;
@@ -214,7 +214,7 @@ int _rtw_enqueue_recvframe(struct recv_frame *precvframe, struct __queue *queue)struct recv_priv *precvpriv = &padapter->recvpriv; -rtw_list_delete (&(precvframe->list)); +list_del_init (&(precvframe->list));list_add_tail (&(precvframe->list),get_list_head (queue));if (padapter !=NULL ) {
@@ -1044,7 +1044,7 @@ static int validate_recv_ctrl_frame(struct adapter *padapter, xmitframe_plist = xmitframe_plist->next; -rtw_list_delete (&pxmitframe->list); +list_del_init (&pxmitframe->list); psta->sleepq_len--;
@@ -1454,7 +1454,7 @@ static struct recv_frame *recvframe_defrag(struct adapter *adapter, plist = phead->next; pfhdr = container_of(plist, struct recv_frame, list); prframe = (struct recv_frame *)pfhdr; -rtw_list_delete (&(prframe->list)); +list_del_init (&(prframe->list));if (curfragnum != pfhdr->attrib.frag_num) {/* the first fragment number must be 0 */
@@ -1789,7 +1789,7 @@ static int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl,break ; } -rtw_list_delete (&(prframe->list)); +list_del_init (&(prframe->list));list_add_tail (&(prframe->list), plist);return true;
@@ -1830,7 +1830,7 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor ("recv_indicatepkts_in_order: indicate=%d seq=%d amsdu=%d\n" , preorder_ctrl->indicate_seq, pattrib->seq_num, pattrib->amsdu)); plist = plist->next; -rtw_list_delete (&(prframe->list)); +list_del_init (&(prframe->list));if (SN_EQUAL (preorder_ctrl->indicate_seq, pattrib->seq_num)) preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq +1 ) &0xFFF ;
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c +8 -8
@@ -228,7 +228,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) psta =NULL ; }else { psta = container_of((&pfree_sta_queue->queue)->next, struct sta_info, list); -rtw_list_delete (&(psta->list)); +list_del_init (&(psta->list));spin_unlock_bh (&pfree_sta_queue->lock);_rtw_init_stainfo (psta);memcpy (psta->hwaddr, hwaddr,ETH_ALEN );
@@ -317,23 +317,23 @@ u32 rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta)rtw_free_xmitframe_queue (pxmitpriv, &pstaxmitpriv->vo_q.sta_pending); -rtw_list_delete (&(pstaxmitpriv->vo_q.tx_pending)); +list_del_init (&(pstaxmitpriv->vo_q.tx_pending));rtw_free_xmitframe_queue (pxmitpriv, &pstaxmitpriv->vi_q.sta_pending); -rtw_list_delete (&(pstaxmitpriv->vi_q.tx_pending)); +list_del_init (&(pstaxmitpriv->vi_q.tx_pending));rtw_free_xmitframe_queue (pxmitpriv, &pstaxmitpriv->bk_q.sta_pending); -rtw_list_delete (&(pstaxmitpriv->bk_q.tx_pending)); +list_del_init (&(pstaxmitpriv->bk_q.tx_pending));rtw_free_xmitframe_queue (pxmitpriv, &pstaxmitpriv->be_q.sta_pending); -rtw_list_delete (&(pstaxmitpriv->be_q.tx_pending)); +list_del_init (&(pstaxmitpriv->be_q.tx_pending));spin_unlock_bh (&pxmitpriv->lock); -rtw_list_delete (&psta->hash_list); +list_del_init (&psta->hash_list);RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_err_, ("\n free number_%d stainfo with hwaddr=0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x\n" , pstapriv->asoc_sta_count , psta->hwaddr[0 ], psta->hwaddr[1 ], psta->hwaddr[2 ], psta->hwaddr[3 ], psta->hwaddr[4 ], psta->hwaddr[5 ])); pstapriv->asoc_sta_count--;
@@ -368,7 +368,7 @@ u32 rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta) plist = plist->next; -rtw_list_delete (&(prframe->list)); +list_del_init (&(prframe->list));rtw_free_recvframe (prframe, pfree_recv_queue); }
@@ -383,7 +383,7 @@ u32 rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta)spin_lock_bh (&pstapriv->auth_list_lock);if (!list_empty (&psta->auth_list)) { -rtw_list_delete (&psta->auth_list); +list_del_init (&psta->auth_list); pstapriv->auth_list_cnt--; }spin_unlock_bh (&pstapriv->auth_list_lock);
drivers/staging/rtl8188eu/core/rtw_xmit.c +18 -18
@@ -1231,7 +1231,7 @@ struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv) pxmitbuf = container_of(plist, struct xmit_buf, list); -rtw_list_delete (&(pxmitbuf->list)); +list_del_init (&(pxmitbuf->list)); }if (pxmitbuf !=NULL ) {
@@ -1263,7 +1263,7 @@ s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)spin_lock_irqsave (&pfree_queue->lock, irql); -rtw_list_delete (&pxmitbuf->list); +list_del_init (&pxmitbuf->list);list_add_tail (&(pxmitbuf->list),get_list_head (pfree_queue)); pxmitpriv->free_xmit_extbuf_cnt++;
@@ -1295,7 +1295,7 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv) pxmitbuf = container_of(plist, struct xmit_buf, list); -rtw_list_delete (&(pxmitbuf->list)); +list_del_init (&(pxmitbuf->list)); }if (pxmitbuf !=NULL ) {
@@ -1330,7 +1330,7 @@ s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) }else {spin_lock_irqsave (&pfree_xmitbuf_queue->lock, irql); -rtw_list_delete (&pxmitbuf->list); +list_del_init (&pxmitbuf->list);list_add_tail (&(pxmitbuf->list),get_list_head (pfree_xmitbuf_queue));
@@ -1379,7 +1379,7 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)/* _queue *pf pxframe = container_of(plist, struct xmit_frame, list); -rtw_list_delete (&(pxframe->list)); +list_del_init (&(pxframe->list)); }if (pxframe !=NULL ) {/* default value setting */
@@ -1422,7 +1422,7 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframspin_lock_bh (&pfree_xmit_queue->lock); -rtw_list_delete (&pxmitframe->list); +list_del_init (&pxmitframe->list);if (pxmitframe->pkt) { pndis_pkt = pxmitframe->pkt;
@@ -1492,7 +1492,7 @@ static struct xmit_frame *dequeue_one_xmitframe(struct xmit_priv *pxmitpriv, str xmitframe_plist = xmitframe_plist->next; -rtw_list_delete (&pxmitframe->list); +list_del_init (&pxmitframe->list); ptxservq->qcnt--; }
@@ -1540,7 +1540,7 @@ struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmi/* Remove sta node when there are no pending packets. */ if (_rtw_queue_empty (pframe_queue))/* must be done after get_next and before break */ -rtw_list_delete (&ptxservq->tx_pending); +list_del_init (&ptxservq->tx_pending); goto exit; }
@@ -1800,7 +1800,7 @@ int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fraspin_lock_bh (&psta->sleep_q.lock);if (pstapriv->sta_dz_bitmap) {/* if any one sta is in ps mode */ -rtw_list_delete (&pxmitframe->list); +list_del_init (&pxmitframe->list);list_add_tail (&pxmitframe->list,get_list_head (&psta->sleep_q));
@@ -1825,7 +1825,7 @@ int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_frau8 wmmps_ac =0 ;if (pstapriv->sta_dz_bitmap&BIT (psta->aid)) { -rtw_list_delete (&pxmitframe->list); +list_del_init (&pxmitframe->list);list_add_tail (&pxmitframe->list,get_list_head (&psta->sleep_q));
@@ -1919,21 +1919,21 @@ void stop_sta_xmit(struct adapter *padapter, struct sta_info *psta) pstapriv->sta_dz_bitmap |=BIT (psta->aid);dequeue_xmitframes_to_sleeping_queue (padapter, psta, &pstaxmitpriv->vo_q.sta_pending); -rtw_list_delete (&(pstaxmitpriv->vo_q.tx_pending)); +list_del_init (&(pstaxmitpriv->vo_q.tx_pending));dequeue_xmitframes_to_sleeping_queue (padapter, psta, &pstaxmitpriv->vi_q.sta_pending); -rtw_list_delete (&(pstaxmitpriv->vi_q.tx_pending)); +list_del_init (&(pstaxmitpriv->vi_q.tx_pending));dequeue_xmitframes_to_sleeping_queue (padapter, psta, &pstaxmitpriv->be_q.sta_pending); -rtw_list_delete (&(pstaxmitpriv->be_q.tx_pending)); +list_del_init (&(pstaxmitpriv->be_q.tx_pending));dequeue_xmitframes_to_sleeping_queue (padapter, psta, &pstaxmitpriv->bk_q.sta_pending); -rtw_list_delete (&(pstaxmitpriv->bk_q.tx_pending)); +list_del_init (&(pstaxmitpriv->bk_q.tx_pending));/* for BC/MC Frames */ pstaxmitpriv = &psta_bmc->sta_xmitpriv;dequeue_xmitframes_to_sleeping_queue (padapter, psta_bmc, &pstaxmitpriv->be_q.sta_pending); -rtw_list_delete (&(pstaxmitpriv->be_q.tx_pending)); +list_del_init (&(pstaxmitpriv->be_q.tx_pending));spin_unlock_bh (&pxmitpriv->lock); }
@@ -1956,7 +1956,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta) xmitframe_plist = xmitframe_plist->next; -rtw_list_delete (&pxmitframe->list); +list_del_init (&pxmitframe->list);switch (pxmitframe->attrib.priority) {case 1 :
@@ -2037,7 +2037,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta) xmitframe_plist = xmitframe_plist->next; -rtw_list_delete (&pxmitframe->list); +list_del_init (&pxmitframe->list); psta_bmc->sleepq_len--;if (psta_bmc->sleepq_len >0 )
@@ -2107,7 +2107,7 @@ void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *pstif (!wmmps_ac)continue ; -rtw_list_delete (&pxmitframe->list); +list_del_init (&pxmitframe->list); psta->sleepq_len--; psta->sleepq_ac_len--;
drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c +2 -2
@@ -549,7 +549,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitp pxmitframe->pkt_offset =1 ;break ; } -rtw_list_delete (&pxmitframe->list); +list_del_init (&pxmitframe->list); ptxservq->qcnt--; phwxmit->accnt--;
@@ -584,7 +584,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitp }/* end while (aggregate same priority and same DA(AP or STA) frames) */ if (_rtw_queue_empty (&ptxservq->sta_pending) == true) -rtw_list_delete (&ptxservq->tx_pending); +list_del_init (&ptxservq->tx_pending);spin_unlock_bh (&pxmitpriv->lock); if ((pfirstframe->attrib.ether_type != 0x0806) &&
drivers/staging/rtl8188eu/include/osdep_service.h +0 -7
@@ -76,11 +76,6 @@ static inline int _enter_critical_mutex(struct mutex *pmutex,return ret; } -static inline void rtw_list_delete (struct list_head *plist) -{ -list_del_init (plist); -} -static inline void _init_timer (struct timer_list *ptimer,struct net_device *nic_hdl,void *pfunc,void *cntx)
@@ -173,8 +168,6 @@ void *rtw_malloc2d(int h, int w, int size);void _rtw_memcpy (void *dec,void *sour,u32 sz); -void rtw_list_delete (struct list_head *plist); -u32 _rtw_down_sema (struct semaphore *sema);void _rtw_init_queue (struct __queue *pqueue);
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +1 -1
@@ -5177,7 +5177,7 @@ static int rtw_del_sta(struct net_device *dev, struct ieee_param *param)if (psta) {spin_lock_bh (&pstapriv->asoc_list_lock);if (!list_empty (&psta->asoc_list)) { -rtw_list_delete (&psta->asoc_list); +list_del_init (&psta->asoc_list); pstapriv->asoc_list_cnt--; updated =ap_free_sta (padapter, psta, true,WLAN_REASON_DEAUTH_LEAVING ); }
Signature · 1 line
1.7.10.4
PATCH 22/42 staging: rtl8188eu: osdep_service.c: Remove unused macro
In reply to navin patidar--- drivers/staging/rtl8188eu/os_dep/osdep_service.c | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/rtl8188eu/os_dep/osdep_service.c +0 -2
@@ -98,8 +98,6 @@ inline s32 rtw_get_passing_time_ms(u32 start)return rtw_systime_to_ms (jiffies-start); } -#define RTW_SUSPEND_LOCK_NAME "rtw_wifi" -struct net_device *rtw_alloc_etherdev_with_old_priv (int sizeof_priv,void *old_priv) {
Signature · 1 line
1.7.10.4
PATCH 23/42 staging: rtl8188eu: Replace _rtw_queue_empty() with list_empty()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8188eu/core/rtw_mlme.c | 6 +++--- drivers/staging/rtl8188eu/core/rtw_recv.c | 4 ++-- drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 2 +- drivers/staging/rtl8188eu/core/rtw_xmit.c | 16 ++++++++-------- drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 2 +- drivers/staging/rtl8188eu/include/osdep_service.h | 1 - drivers/staging/rtl8188eu/os_dep/osdep_service.c | 5 ----- 8 files changed, 16 insertions(+), 22 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c +1 -1
@@ -85,7 +85,7 @@ u8 rtw_do_join(struct adapter *padapter) pmlmepriv->to_join = true; -if (_rtw_queue_empty (queue)) { +if (list_empty (&queue->queue)) {spin_unlock_bh (&(pmlmepriv->scanned_queue.lock));_clr_fwstate_ (pmlmepriv, _FW_UNDER_LINKING);
drivers/staging/rtl8188eu/core/rtw_mlme.c +3 -3
@@ -149,7 +149,7 @@ struct wlan_network *_rtw_dequeue_network(struct __queue *queue)spin_lock_bh (&queue->lock); -if (_rtw_queue_empty (queue)) { +if (list_empty (&queue->queue)) { pnetwork =NULL ; }else { pnetwork = container_of((&queue->queue)->next, struct wlan_network, list);
@@ -170,7 +170,7 @@ struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv)/* _queue *fspin_lock_bh (&free_queue->lock); -if (_rtw_queue_empty (free_queue) == true) { +if (list_empty (&free_queue->queue)) { pnetwork =NULL ; goto exit; }
@@ -535,7 +535,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t/* If we didn't find a match, then get a new network slot to initialize * with this beacon's information */ if (phead == plist) { -if (_rtw_queue_empty (&(pmlmepriv->free_bss_pool)) == true) { +if (list_empty (&(pmlmepriv->free_bss_pool.queue))) {/* If there are no more slots, expire the oldest */ pnetwork = oldest;
drivers/staging/rtl8188eu/core/rtw_recv.c +2 -2
@@ -131,7 +131,7 @@ struct recv_frame *_rtw_alloc_recvframe (struct __queue *pfree_recv_queue)struct adapter *padapter;struct recv_priv *precvpriv; -if (_rtw_queue_empty (pfree_recv_queue)) { +if (list_empty (&pfree_recv_queue->queue)) { hdr =NULL ; }else { phead =get_list_head (pfree_recv_queue);
@@ -1563,7 +1563,7 @@ struct recv_frame *recvframe_chk_defrag(struct adapter *padapter,if (pdefrag_q !=NULL ) {if (fragnum ==0 ) {/* the first fragment */ -if (_rtw_queue_empty (pdefrag_q) == false) { +if (!list_empty (&pdefrag_q->queue)) {/* free current defrag_q */ rtw_free_recvframe_queue (pdefrag_q, pfree_recv_queue); }
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c +1 -1
@@ -223,7 +223,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)spin_lock_bh (&(pfree_sta_queue->lock)); -if (_rtw_queue_empty (pfree_sta_queue) == true) { +if (list_empty (&pfree_sta_queue->queue)) {spin_unlock_bh (&pfree_sta_queue->lock); psta =NULL ; }else {
drivers/staging/rtl8188eu/core/rtw_xmit.c +8 -8
@@ -901,10 +901,10 @@ s32 rtw_txframes_pending(struct adapter *padapter) {struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -return ((_rtw_queue_empty (&pxmitpriv->be_pending) == false) || - (_rtw_queue_empty (&pxmitpriv->bk_pending) == false) || - (_rtw_queue_empty (&pxmitpriv->vi_pending) == false) || - (_rtw_queue_empty (&pxmitpriv->vo_pending) == false)); +return (!list_empty (&pxmitpriv->be_pending.queue) || + !list_empty (&pxmitpriv->bk_pending.queue) || + !list_empty (&pxmitpriv->vi_pending.queue) || + !list_empty (&pxmitpriv->vo_pending.queue)); }s32 rtw_txframes_sta_ac_pending (struct adapter *padapter,struct pkt_attrib *pattrib)
@@ -1222,7 +1222,7 @@ struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv)spin_lock_irqsave (&pfree_queue->lock, irql); -if (_rtw_queue_empty (pfree_queue) == true) { +if (list_empty (&pfree_queue->queue)) { pxmitbuf =NULL ; }else { phead =get_list_head (pfree_queue);
@@ -1286,7 +1286,7 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv)spin_lock_irqsave (&pfree_xmitbuf_queue->lock, irql); -if (_rtw_queue_empty (pfree_xmitbuf_queue) == true) { +if (list_empty (&pfree_xmitbuf_queue->queue)) { pxmitbuf =NULL ; }else { phead =get_list_head (pfree_xmitbuf_queue);
@@ -1369,7 +1369,7 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)/* _queue *pfspin_lock_bh (&pfree_xmit_queue->lock); -if (_rtw_queue_empty (pfree_xmit_queue) == true) { +if (list_empty (&pfree_xmit_queue->queue)) {RT_TRACE (_module_rtl871x_xmit_c_, _drv_info_, ("rtw_alloc_xmitframe:%d\n" , pxmitpriv->free_xmitframe_cnt)); pxframe =NULL ; }else {
@@ -1539,7 +1539,7 @@ struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmi phwxmit->accnt--;/* Remove sta node when there are no pending packets. */ -if (_rtw_queue_empty (pframe_queue))/* must be done after get_next and before break */ +if (list_empty (&pframe_queue->queue))/* must be done after get_next and before break */ list_del_init (&ptxservq->tx_pending); goto exit; }
drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c +1 -1
@@ -583,7 +583,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitp } }/* end while (aggregate same priority and same DA(AP or STA) frames) */ -if (_rtw_queue_empty (&ptxservq->sta_pending) == true) +if (list_empty (&ptxservq->sta_pending.queue))list_del_init (&ptxservq->tx_pending);spin_unlock_bh (&pxmitpriv->lock);
drivers/staging/rtl8188eu/include/osdep_service.h +0 -1
@@ -171,7 +171,6 @@ void _rtw_memcpy(void *dec, void *sour, u32 sz);u32 _rtw_down_sema (struct semaphore *sema);void _rtw_init_queue (struct __queue *pqueue); -u32 _rtw_queue_empty (struct __queue *pqueue);u32 rtw_systime_to_ms (u32 systime);u32 rtw_ms_to_systime (u32 ms);
drivers/staging/rtl8188eu/os_dep/osdep_service.c +0 -5
@@ -77,11 +77,6 @@ void _rtw_init_queue(struct __queue *pqueue)spin_lock_init (&(pqueue->lock)); } -u32 _rtw_queue_empty (struct __queue *pqueue) -{ -return list_empty (&(pqueue->queue)); -} -inline u32 rtw_systime_to_ms (u32 systime) {return systime *1000 /HZ ;
Signature · 1 line
1.7.10.4
PATCH 24/42 staging: rtl8188eu: Replace _cancel_workitem_sync() with cancel_work_sync()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_cmd.c | 2 +- drivers/staging/rtl8188eu/core/rtw_led.c | 2 +- drivers/staging/rtl8188eu/include/osdep_service.h | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-)
drivers/staging/rtl8188eu/core/rtw_cmd.c +1 -1
@@ -96,7 +96,7 @@ void rtw_free_evt_priv(struct evt_priv *pevtpriv)RT_TRACE (_module_rtl871x_cmd_c_, _drv_info_, ("+rtw_free_evt_priv\n" )); -_cancel_workitem_sync (&pevtpriv->c2h_wk); +cancel_work_sync (&pevtpriv->c2h_wk);while (pevtpriv->c2h_wk_alive)msleep (10 );
drivers/staging/rtl8188eu/core/rtw_led.c +1 -1
@@ -88,7 +88,7 @@ void InitLed871x(struct adapter *padapter, struct LED_871x *pLed)/* */ void DeInitLed871x (struct LED_871x *pLed) { -_cancel_workitem_sync (&(pLed->BlinkWorkItem)); +cancel_work_sync (&(pLed->BlinkWorkItem));_cancel_timer_ex (&(pLed->BlinkTimer));ResetLedStatus (pLed); }
drivers/staging/rtl8188eu/include/osdep_service.h +0 -5
@@ -101,11 +101,6 @@ static inline void _cancel_timer(struct timer_list *ptimer, u8 *bcancelled)#define RTW_DECLARE_TIMER_HDL (name) \ void RTW_TIMER_HDL_NAME(name)(RTW_TIMER_HDL_ARGS) -static inline void _cancel_workitem_sync (struct work_struct *pwork) -{ -cancel_work_sync (pwork); -} -static inline int rtw_netif_queue_stopped (struct net_device *pnetdev) { return netif_tx_queue_stopped(netdev_get_tx_queue(pnetdev, 0)) &&
Signature · 1 line
1.7.10.4
PATCH 25/42 staging: rtl8188eu: Remove unused inline function _RND512()
In reply to navin patidar--- drivers/staging/rtl8188eu/include/osdep_service.h | 8 -------- 1 file changed, 8 deletions(-)
drivers/staging/rtl8188eu/include/osdep_service.h +0 -8
@@ -222,14 +222,6 @@ static inline u32 _RND256(u32 sz)return val; } -static inline u32 _RND512 (u32 sz) -{ -u32 val; - - val = ((sz >>9 ) + ((sz &511 ) ?1 :0 )) <<9 ; -return val; -} -static inline u32 bitshift (u32 bitmask) {u32 i;
Signature · 1 line
1.7.10.4
PATCH 26/42 staging: rtl8188eu: Replace _cancel_timer_ex() with del_timer_sync()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_led.c | 50 ++++++++++----------- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 37 ++++++++------- drivers/staging/rtl8188eu/include/osdep_service.h | 5 --- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 2 +- drivers/staging/rtl8188eu/os_dep/os_intfs.c | 16 +++---- 5 files changed, 52 insertions(+), 58 deletions(-)
drivers/staging/rtl8188eu/core/rtw_led.c +25 -25
@@ -89,7 +89,7 @@ void InitLed871x(struct adapter *padapter, struct LED_871x *pLed)void DeInitLed871x (struct LED_871x *pLed) {cancel_work_sync (&(pLed->BlinkWorkItem)); -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer));ResetLedStatus (pLed); }
@@ -251,11 +251,11 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedActif (pLed->CurrLedState ==LED_BLINK_SCAN ||IS_LED_WPS_BLINKING (pLed))return ;if (pLed->bLedLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer)); pLed->bLedLinkBlinkInProgress = false; }if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer)); pLed->bLedBlinkInProgress = false; }
@@ -273,11 +273,11 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedActif (pLed->CurrLedState ==LED_BLINK_SCAN ||IS_LED_WPS_BLINKING (pLed))return ;if (pLed->bLedNoLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer)); pLed->bLedNoLinkBlinkInProgress = false; }if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer)); pLed->bLedBlinkInProgress = false; } pLed->bLedLinkBlinkInProgress = true;
@@ -296,15 +296,15 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedActif (IS_LED_WPS_BLINKING (pLed))return ;if (pLed->bLedNoLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer)); pLed->bLedNoLinkBlinkInProgress = false; }if (pLed->bLedLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer)); pLed->bLedLinkBlinkInProgress = false; }if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer)); pLed->bLedBlinkInProgress = false; } pLed->bLedScanBlinkInProgress = true;
@@ -323,11 +323,11 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedActif (pLed->CurrLedState ==LED_BLINK_SCAN ||IS_LED_WPS_BLINKING (pLed))return ;if (pLed->bLedNoLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer)); pLed->bLedNoLinkBlinkInProgress = false; }if (pLed->bLedLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer)); pLed->bLedLinkBlinkInProgress = false; } pLed->bLedBlinkInProgress = true;
@@ -344,19 +344,19 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedActcase LED_CTL_START_WPS_BOTTON :if (!pLed->bLedWPSBlinkInProgress) {if (pLed->bLedNoLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer)); pLed->bLedNoLinkBlinkInProgress = false; }if (pLed->bLedLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer)); pLed->bLedLinkBlinkInProgress = false; }if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer)); pLed->bLedBlinkInProgress = false; }if (pLed->bLedScanBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer)); pLed->bLedScanBlinkInProgress = false; } pLed->bLedWPSBlinkInProgress = true;
@@ -370,23 +370,23 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedActbreak ;case LED_CTL_STOP_WPS :if (pLed->bLedNoLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer)); pLed->bLedNoLinkBlinkInProgress = false; }if (pLed->bLedLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer)); pLed->bLedLinkBlinkInProgress = false; }if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer)); pLed->bLedBlinkInProgress = false; }if (pLed->bLedScanBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer)); pLed->bLedScanBlinkInProgress = false; }if (pLed->bLedWPSBlinkInProgress) -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer));else pLed->bLedWPSBlinkInProgress = true; pLed->CurrLedState =LED_BLINK_WPS_STOP ;
@@ -400,7 +400,7 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedActbreak ;case LED_CTL_STOP_WPS_FAIL :if (pLed->bLedWPSBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer)); pLed->bLedWPSBlinkInProgress = false; } pLed->bLedNoLinkBlinkInProgress = true;
@@ -415,23 +415,23 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct pLed->CurrLedState =RTW_LED_OFF ; pLed->BlinkingLedState =RTW_LED_OFF ;if (pLed->bLedNoLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer)); pLed->bLedNoLinkBlinkInProgress = false; }if (pLed->bLedLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer)); pLed->bLedLinkBlinkInProgress = false; }if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer)); pLed->bLedBlinkInProgress = false; }if (pLed->bLedWPSBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer)); pLed->bLedWPSBlinkInProgress = false; }if (pLed->bLedScanBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +del_timer_sync (&(pLed->BlinkTimer)); pLed->bLedScanBlinkInProgress = false; }SwLedOff (padapter, pLed);
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +18 -19
@@ -408,9 +408,8 @@ void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext)return ;if (padapter->bDriverStopped) { -_cancel_timer_ex (&pmlmeext->survey_timer); -_cancel_timer_ex (&pmlmeext->link_timer); -/* _cancel_timer_ex(&pmlmeext->ADDBA_timer); */ +del_timer_sync (&pmlmeext->survey_timer); +del_timer_sync (&pmlmeext->link_timer); } }
@@ -1495,7 +1494,7 @@ unsigned int OnAssocRsp(struct adapter *padapter, struct recv_frame *precv_frameif (pmlmeinfo->state &WIFI_FW_ASSOC_SUCCESS )return _SUCCESS; -_cancel_timer_ex (&pmlmeext->link_timer); +del_timer_sync (&pmlmeext->link_timer);/* status */ status =le16_to_cpu (*(__le16 *)(pframe +WLAN_HDR_A3_LEN +2 ));
@@ -1578,7 +1577,7 @@ unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_frame)#ifdef CONFIG_88EU_P2P if (pwdinfo->rx_invitereq_info.scan_op_ch_only) { -_cancel_timer_ex (&pwdinfo->reset_ch_sitesurvey); +del_timer_sync (&pwdinfo->reset_ch_sitesurvey);_set_timer (&pwdinfo->reset_ch_sitesurvey,10 ); }#endif /* CONFIG_88EU_P2P */
@@ -1642,7 +1641,7 @@ unsigned int OnDisassoc(struct adapter *padapter, struct recv_frame *precv_frame#ifdef CONFIG_88EU_P2P if (pwdinfo->rx_invitereq_info.scan_op_ch_only) { -_cancel_timer_ex (&pwdinfo->reset_ch_sitesurvey); +del_timer_sync (&pwdinfo->reset_ch_sitesurvey);_set_timer (&pwdinfo->reset_ch_sitesurvey,10 ); }#endif /* CONFIG_88EU_P2P */
@@ -3912,7 +3911,7 @@ static unsigned int on_action_public_p2p(struct recv_frame *precv_frame)return _FAIL;#ifdef CONFIG_88EU_P2P -_cancel_timer_ex (&pwdinfo->reset_ch_sitesurvey); +del_timer_sync (&pwdinfo->reset_ch_sitesurvey);/* Do nothing if the driver doesn't enable the P2P function. */ if (rtw_p2p_chk_state (pwdinfo,P2P_STATE_NONE ) ||rtw_p2p_chk_state (pwdinfo,P2P_STATE_IDLE ))return _SUCCESS;
@@ -3930,7 +3929,7 @@ static unsigned int on_action_public_p2p(struct recv_frame *precv_frame)if (rtw_p2p_chk_state (pwdinfo,P2P_STATE_GONEGO_FAIL )) {/* Commented by Albert 20110526 */ /* In this case, this means the previous nego fail doesn't be reset yet. */ -_cancel_timer_ex (&pwdinfo->restore_p2p_state_timer); +del_timer_sync (&pwdinfo->restore_p2p_state_timer);/* Restore the previous p2p state */ rtw_p2p_set_state (pwdinfo,rtw_p2p_pre_state (pwdinfo));DBG_88E ("[%s] Restore the previous p2p state to %d\n" , __func__,rtw_p2p_state (pwdinfo));
@@ -3960,7 +3959,7 @@ static unsigned int on_action_public_p2p(struct recv_frame *precv_frame)if (rtw_p2p_chk_state (pwdinfo,P2P_STATE_GONEGO_ING )) {/* Commented by Albert 20110425 */ /* The restore timer is enabled when issuing the nego request frame of rtw_p2p_connect function. */ -_cancel_timer_ex (&pwdinfo->restore_p2p_state_timer); +del_timer_sync (&pwdinfo->restore_p2p_state_timer); pwdinfo->nego_req_info.benable = false; result =process_p2p_group_negotation_resp (pwdinfo, frame_body, len);issue_p2p_GO_confirm (pwdinfo->padapter,GetAddr2Ptr (pframe), result);
@@ -4111,7 +4110,7 @@ static unsigned int on_action_public_p2p(struct recv_frame *precv_frame)u32 attr_contentlen =0 ;DBG_88E ("[%s] Got invite response frame!\n" , __func__); -_cancel_timer_ex (&pwdinfo->restore_p2p_state_timer); +del_timer_sync (&pwdinfo->restore_p2p_state_timer); p2p_ie =rtw_get_p2p_ie (frame_body + _PUBLIC_ACTION_IE_OFFSET_, len - _PUBLIC_ACTION_IE_OFFSET_,NULL , &p2p_ielen);if (p2p_ie) {rtw_get_p2p_attr_content (p2p_ie, p2p_ielen,P2P_ATTR_STATUS , &attr_content, &attr_contentlen);
@@ -4169,7 +4168,7 @@ static unsigned int on_action_public_p2p(struct recv_frame *precv_frame)DBG_88E ("[%s] Got Provisioning Discovery Response Frame\n" , __func__);/* Commented by Albert 20110426 */ /* The restore timer is enabled when issuing the provisioing request frame in rtw_p2p_prov_disc function. */ -_cancel_timer_ex (&pwdinfo->restore_p2p_state_timer); +del_timer_sync (&pwdinfo->restore_p2p_state_timer);rtw_p2p_set_state (pwdinfo,P2P_STATE_RX_PROVISION_DIS_RSP );process_p2p_provdisc_resp (pwdinfo, pframe);_set_timer (&pwdinfo->restore_p2p_state_timer,P2P_PROVISION_TIMEOUT );
@@ -5866,7 +5865,7 @@ static int _issue_deauth(struct adapter *padapter, unsigned char *da, unsigned s#ifdef CONFIG_88EU_P2P if (!(rtw_p2p_chk_state (pwdinfo,P2P_STATE_NONE )) && (pwdinfo->rx_invitereq_info.scan_op_ch_only)) { -_cancel_timer_ex (&pwdinfo->reset_ch_sitesurvey); +del_timer_sync (&pwdinfo->reset_ch_sitesurvey);_set_timer (&pwdinfo->reset_ch_sitesurvey,10 ); }#endif /* CONFIG_88EU_P2P */
@@ -6813,7 +6812,7 @@ void start_clnt_auth(struct adapter *padapter)struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -_cancel_timer_ex (&pmlmeext->link_timer); +del_timer_sync (&pmlmeext->link_timer); pmlmeinfo->state &= (~WIFI_FW_AUTH_NULL ); pmlmeinfo->state |=WIFI_FW_AUTH_STATE ;
@@ -6844,7 +6843,7 @@ void start_clnt_assoc(struct adapter *padapter)struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -_cancel_timer_ex (&pmlmeext->link_timer); +del_timer_sync (&pmlmeext->link_timer); pmlmeinfo->state &= (~(WIFI_FW_AUTH_NULL |WIFI_FW_AUTH_STATE )); pmlmeinfo->state |= (WIFI_FW_AUTH_SUCCESS |WIFI_FW_ASSOC_STATE );
@@ -7491,7 +7490,7 @@ void mlmeext_sta_del_event_callback(struct adapter *padapter)/* set MSR to no link state -> infra. mode */ Set_MSR (padapter, _HW_STATE_STATION_); -_cancel_timer_ex (&pmlmeext->link_timer); +del_timer_sync (&pmlmeext->link_timer); } }
@@ -7829,7 +7828,7 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf)/* rtw_hal_set_hwreg(padapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain)); */ /* cancel link timer */ -_cancel_timer_ex (&pmlmeext->link_timer); +del_timer_sync (&pmlmeext->link_timer);/* clear CAM */ flush_all_cam_entry (padapter);
@@ -7869,7 +7868,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)/* clear CAM */ flush_all_cam_entry (padapter); -_cancel_timer_ex (&pmlmeext->link_timer); +del_timer_sync (&pmlmeext->link_timer);/* set MSR to nolink -> infra. mode */ Set_MSR (padapter, _HW_STATE_STATION_);
@@ -7955,7 +7954,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)rtw_hal_set_hwreg (padapter,HW_VAR_MLME_JOIN , (u8 *)(&join_type));/* cancel link timer */ -_cancel_timer_ex (&pmlmeext->link_timer); +del_timer_sync (&pmlmeext->link_timer);start_clnt_join (padapter);
@@ -7999,7 +7998,7 @@ u8 disconnect_hdl(struct adapter *padapter, unsigned char *pbuf)flush_all_cam_entry (padapter); -_cancel_timer_ex (&pmlmeext->link_timer); +del_timer_sync (&pmlmeext->link_timer);rtw_free_uc_swdec_pending_queue (padapter);
drivers/staging/rtl8188eu/include/osdep_service.h +0 -5
@@ -171,11 +171,6 @@ u32 rtw_systime_to_ms(u32 systime);u32 rtw_ms_to_systime (u32 ms);s32 rtw_get_passing_time_ms (u32 start); -static inline unsigned char _cancel_timer_ex (struct timer_list *ptimer) -{ -return del_timer_sync (ptimer); -} -static inline void thread_enter (char *name) {allow_signal (SIGTERM );
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +1 -1
@@ -3441,7 +3441,7 @@ static int rtw_p2p_connect(struct net_device *dev,memcpy (pwdinfo->nego_req_info.peerDevAddr, pnetwork->network.MacAddress,ETH_ALEN ); pwdinfo->nego_req_info.benable = true; -_cancel_timer_ex (&pwdinfo->restore_p2p_state_timer); +del_timer_sync (&pwdinfo->restore_p2p_state_timer);if (rtw_p2p_state (pwdinfo) !=P2P_STATE_GONEGO_OK ) {/* Restore to the listen state if the current p2p state is not nego OK */ rtw_p2p_set_state (pwdinfo,P2P_STATE_LISTEN );
drivers/staging/rtl8188eu/os_dep/os_intfs.c +8 -8
@@ -930,22 +930,22 @@ void rtw_cancel_all_timer(struct adapter *padapter) {RT_TRACE (_module_os_intfs_c_, _drv_info_, ("+rtw_cancel_all_timer\n" )); -_cancel_timer_ex (&padapter->mlmepriv.assoc_timer); +del_timer_sync (&padapter->mlmepriv.assoc_timer);RT_TRACE (_module_os_intfs_c_, _drv_info_, ("rtw_cancel_all_timer:cancel association timer complete!\n" )); -_cancel_timer_ex (&padapter->mlmepriv.scan_to_timer); +del_timer_sync (&padapter->mlmepriv.scan_to_timer);RT_TRACE (_module_os_intfs_c_, _drv_info_, ("rtw_cancel_all_timer:cancel scan_to_timer!\n" )); -_cancel_timer_ex (&padapter->mlmepriv.dynamic_chk_timer); +del_timer_sync (&padapter->mlmepriv.dynamic_chk_timer);RT_TRACE (_module_os_intfs_c_, _drv_info_, ("rtw_cancel_all_timer:cancel dynamic_chk_timer!\n" ));/* cancel sw led timer */ rtw_hal_sw_led_deinit (padapter);RT_TRACE (_module_os_intfs_c_, _drv_info_, ("rtw_cancel_all_timer:cancel DeInitSwLeds!\n" )); -_cancel_timer_ex (&padapter->pwrctrlpriv.pwr_state_check_timer); +del_timer_sync (&padapter->pwrctrlpriv.pwr_state_check_timer); -_cancel_timer_ex (&padapter->recvpriv.signal_stat_timer); +del_timer_sync (&padapter->recvpriv.signal_stat_timer); }u8 rtw_free_drv_sw (struct adapter *padapter)
@@ -959,9 +959,9 @@ u8 rtw_free_drv_sw(struct adapter *padapter) {struct wifidirect_info *pwdinfo = &padapter->wdinfo;if (!rtw_p2p_chk_state (pwdinfo,P2P_STATE_NONE )) { -_cancel_timer_ex (&pwdinfo->find_phase_timer); -_cancel_timer_ex (&pwdinfo->restore_p2p_state_timer); -_cancel_timer_ex (&pwdinfo->pre_tx_scan_timer); +del_timer_sync (&pwdinfo->find_phase_timer); +del_timer_sync (&pwdinfo->restore_p2p_state_timer); +del_timer_sync (&pwdinfo->pre_tx_scan_timer);rtw_p2p_set_state (pwdinfo,P2P_STATE_NONE ); } }
Signature · 1 line
1.7.10.4
PATCH 27/42 staging: rtl8188eu: Use cpu_to_be32() instead of RTW_PUT_BE32()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_p2p.c | 8 +++----- drivers/staging/rtl8188eu/include/osdep_service.h | 10 ---------- 2 files changed, 3 insertions(+), 15 deletions(-)
drivers/staging/rtl8188eu/core/rtw_p2p.c +3 -5
@@ -310,7 +310,7 @@ static void issue_p2p_provision_resp(struct wifidirect_info *pwdinfo, u8 *raddr, wpsielen =0 ;/* WPS OUI */ -RTW_PUT_BE32 (wpsie,WPSOUI ); + *((u32 *)(wpsie+wpsielen)) =cpu_to_be32 (WPSOUI ); wpsielen +=4 ;/* Config Method */
@@ -569,8 +569,7 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) p2pielen +=2 ;/* OUI */ -/* u32*) (p2pie + p2pielen) = cpu_to_be32(WPSOUI); */ -RTW_PUT_BE32 (p2pie + p2pielen,WPSOUI ); + *((u32 *)(p2pie + p2pielen)) =cpu_to_be32 (WPSOUI ); p2pielen +=4 ;/* Sub Category ID */
@@ -683,8 +682,7 @@ u32 build_prov_disc_request_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8 p2pielen +=2 ;/* OUI */ -/* u32*) (p2pie + p2pielen) = cpu_to_be32(WPSOUI); */ -RTW_PUT_BE32 (p2pie + p2pielen,WPSOUI ); + *((u32 *)(p2pie + p2pielen)) =cpu_to_be32 (WPSOUI ); p2pielen +=4 ;/* Sub Category ID */
drivers/staging/rtl8188eu/include/osdep_service.h +0 -10
@@ -155,9 +155,7 @@ extern int RTW_STATUS_CODE(int error_code);#define rtw_update_mem_stat (flag, sz) do {} while (0)u8 *_rtw_malloc (u32 sz); -void _rtw_mfree (u8 *pbuf,u32 sz);#define rtw_malloc (sz) _rtw_malloc((sz)) -#define rtw_mfree (pbuf, sz) _rtw_mfree((pbuf), (sz))void *rtw_malloc2d (int h,int w,int size);
@@ -271,14 +269,6 @@ u64 rtw_modular64(u64 x, u64 y);#define RTW_GET_BE24 (a) ((((u32) (a)[0]) << 16) | (((u32) (a)[1]) << 8) | \ ((u32) (a)[2])) -#define RTW_PUT_BE32 (a, val) \ - do { \ - (a)[0] = (u8) ((((u32) (val)) >> 24) & 0xff); \ - (a)[1] = (u8) ((((u32) (val)) >> 16) & 0xff); \ - (a)[2] = (u8) ((((u32) (val)) >> 8) & 0xff); \ - (a)[3] = (u8) (((u32) (val)) & 0xff); \ - } while (0) -void rtw_buf_free (u8 **buf,u32 *buf_len);void rtw_buf_update (u8 **buf,u32 *buf_len,u8 *src,u32 src_len);
Signature · 1 line
1.7.10.4
PATCH 28/42 staging: rtl8188eu: Use cpu_to_be16() instead of RTW_PUT_BE16()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_p2p.c | 48 ++++++++------------- drivers/staging/rtl8188eu/include/osdep_service.h | 5 --- 2 files changed, 17 insertions(+), 36 deletions(-)
drivers/staging/rtl8188eu/core/rtw_p2p.c +17 -31
@@ -82,8 +82,7 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf) *pcur = psta->dev_cap; pcur++; -/* u16*)(pcur) = cpu_to_be16(psta->config_methods); */ -RTW_PUT_BE16 (pcur, psta->config_methods); + *((u16 *)(pcur)) =cpu_to_be16 (psta->config_methods); pcur +=2 ;memcpy (pcur, psta->primary_dev_type,8 );
@@ -96,12 +95,10 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf) pcur += psta->num_of_secdev_type*8 ;if (psta->dev_name_len >0 ) { -/* u16*)(pcur) = cpu_to_be16(WPS_ATTR_DEVICE_NAME); */ -RTW_PUT_BE16 (pcur,WPS_ATTR_DEVICE_NAME ); + *(u16 *)(pcur) =cpu_to_be16 (WPS_ATTR_DEVICE_NAME ); pcur +=2 ; -/* u16*)(pcur) = cpu_to_be16(psta->dev_name_len); */ -RTW_PUT_BE16 (pcur, psta->dev_name_len); + *(u16 *)(pcur) =cpu_to_be16 (psta->dev_name_len); pcur +=2 ;memcpy (pcur, psta->dev_name, psta->dev_name_len);
@@ -315,15 +312,15 @@ static void issue_p2p_provision_resp(struct wifidirect_info *pwdinfo, u8 *raddr,/* Config Method */ /* Type: */ -RTW_PUT_BE16 (wpsie + wpsielen,WPS_ATTR_CONF_METHOD ); + *(u16 *)(wpsie+wpsielen) =cpu_to_be16 (WPS_ATTR_CONF_METHOD ); wpsielen +=2 ;/* Length: */ -RTW_PUT_BE16 (wpsie + wpsielen,0x0002 ); + *(u16 *)(wpsie+wpsielen) =cpu_to_be16 (0x0002 ); wpsielen +=2 ;/* Value: */ -RTW_PUT_BE16 (wpsie + wpsielen, config_method); + *(u16 *)(wpsie+wpsielen) =cpu_to_be16 (config_method); wpsielen +=2 ; pframe =rtw_set_ie (pframe, _VENDOR_SPECIFIC_IE_, wpsielen, (unsigned char *)wpsie, &pattrib->pktlen);
@@ -558,14 +555,12 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)/* Config Method */ /* This field should be big endian. Noted by P2P specification. */ -/* u16*) (p2pie + p2pielen) = cpu_to_be16(pwdinfo->supported_wps_cm); */ -RTW_PUT_BE16 (p2pie + p2pielen, pwdinfo->supported_wps_cm); + *(u16 *) (p2pie + p2pielen) =cpu_to_be16 (pwdinfo->supported_wps_cm); p2pielen +=2 ;/* Primary Device Type */ /* Category ID */ -/* u16*) (p2pie + p2pielen) = cpu_to_be16(WPS_PDT_CID_MULIT_MEDIA); */ -RTW_PUT_BE16 (p2pie + p2pielen,WPS_PDT_CID_MULIT_MEDIA ); + *(u16 *) (p2pie + p2pielen) =cpu_to_be16 (WPS_PDT_CID_MULIT_MEDIA ); p2pielen +=2 ;/* OUI */
@@ -573,8 +568,7 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) p2pielen +=4 ;/* Sub Category ID */ -/* u16*) (p2pie + p2pielen) = cpu_to_be16(WPS_PDT_SCID_MEDIA_SERVER); */ -RTW_PUT_BE16 (p2pie + p2pielen,WPS_PDT_SCID_MEDIA_SERVER ); + *(u16 *) (p2pie + p2pielen) =cpu_to_be16 (WPS_PDT_SCID_MEDIA_SERVER ); p2pielen +=2 ;/* Number of Secondary Device Types */
@@ -582,13 +576,11 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)/* Device Name */ /* Type: */ -/* u16*) (p2pie + p2pielen) = cpu_to_be16(WPS_ATTR_DEVICE_NAME); */ -RTW_PUT_BE16 (p2pie + p2pielen,WPS_ATTR_DEVICE_NAME ); + *(u16 *) (p2pie + p2pielen) =cpu_to_be16 (WPS_ATTR_DEVICE_NAME ); p2pielen +=2 ;/* Length: */ -/* u16*) (p2pie + p2pielen) = cpu_to_be16(pwdinfo->device_name_len); */ -RTW_PUT_BE16 (p2pie + p2pielen, pwdinfo->device_name_len); + *(u16 *) (p2pie + p2pielen) =cpu_to_be16 (pwdinfo->device_name_len); p2pielen +=2 ;/* Value: */
@@ -666,19 +658,16 @@ u32 build_prov_disc_request_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8/* Config Method */ /* This field should be big endian. Noted by P2P specification. */ if (pwdinfo->ui_got_wps_info ==P2P_GOT_WPSINFO_PBC ) { -/* u16*) (p2pie + p2pielen) = cpu_to_be16(WPS_CONFIG_METHOD_PBC); */ -RTW_PUT_BE16 (p2pie + p2pielen,WPS_CONFIG_METHOD_PBC ); + *(u16 *) (p2pie + p2pielen) =cpu_to_be16 (WPS_CONFIG_METHOD_PBC ); }else { -/* u16*) (p2pie + p2pielen) = cpu_to_be16(WPS_CONFIG_METHOD_DISPLAY); */ -RTW_PUT_BE16 (p2pie + p2pielen,WPS_CONFIG_METHOD_DISPLAY ); + *(u16 *) (p2pie + p2pielen) =cpu_to_be16 (WPS_CONFIG_METHOD_DISPLAY ); } p2pielen +=2 ;/* Primary Device Type */ /* Category ID */ -/* u16*) (p2pie + p2pielen) = cpu_to_be16(WPS_PDT_CID_MULIT_MEDIA); */ -RTW_PUT_BE16 (p2pie + p2pielen,WPS_PDT_CID_MULIT_MEDIA ); + *(u16 *) (p2pie + p2pielen) =cpu_to_be16 (WPS_PDT_CID_MULIT_MEDIA ); p2pielen +=2 ;/* OUI */
@@ -686,8 +675,7 @@ u32 build_prov_disc_request_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8 p2pielen +=4 ;/* Sub Category ID */ -/* u16*) (p2pie + p2pielen) = cpu_to_be16(WPS_PDT_SCID_MEDIA_SERVER); */ -RTW_PUT_BE16 (p2pie + p2pielen,WPS_PDT_SCID_MEDIA_SERVER ); + *(u16 *) (p2pie + p2pielen) =cpu_to_be16 (WPS_PDT_SCID_MEDIA_SERVER ); p2pielen +=2 ;/* Number of Secondary Device Types */
@@ -695,13 +683,11 @@ u32 build_prov_disc_request_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8/* Device Name */ /* Type: */ -/* u16*) (p2pie + p2pielen) = cpu_to_be16(WPS_ATTR_DEVICE_NAME); */ -RTW_PUT_BE16 (p2pie + p2pielen,WPS_ATTR_DEVICE_NAME ); + *(u16 *) (p2pie + p2pielen) =cpu_to_be16 (WPS_ATTR_DEVICE_NAME ); p2pielen +=2 ;/* Length: */ -/* u16*) (p2pie + p2pielen) = cpu_to_be16(pwdinfo->device_name_len); */ -RTW_PUT_BE16 (p2pie + p2pielen, pwdinfo->device_name_len); + *(u16 *) (p2pie + p2pielen) =cpu_to_be16 (pwdinfo->device_name_len); p2pielen +=2 ;/* Value: */
drivers/staging/rtl8188eu/include/osdep_service.h +0 -5
@@ -253,11 +253,6 @@ u64 rtw_modular64(u64 x, u64 y);/* Macros for handling unaligned memory accesses */ #define RTW_GET_BE16 (a) ((u16) (((a)[0] << 8) | (a)[1])) -#define RTW_PUT_BE16 (a, val) \ - do { \ - (a)[0] = ((u16) (val)) >> 8; \ - (a)[1] = ((u16) (val)) & 0xff; \ - } while (0)#define RTW_GET_LE16 (a) ((u16) (((a)[1] << 8) | (a)[0]))#define RTW_PUT_LE16 (a, val) \
Signature · 1 line
1.7.10.4