staging:r8188eu: change rtl8188e_process_phy_info function argument type
PATCH 1/8 staging:r8188eu: change rtl8188e_process_phy_info function argument type
prframe is (void *), but function used only with (struct recv_frame *).
--- drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 5 ++--- drivers/staging/rtl8188eu/include/rtl8188e_recv.h | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c +2 -3
@@ -57,10 +57,9 @@ static void process_link_qual(struct adapter *padapter, signal_stat->avg_val = signal_stat->total_val / signal_stat->total_num; } -void rtl8188e_process_phy_info (struct adapter *padapter,void *prframe) +void rtl8188e_process_phy_info (struct adapter *padapter, +struct recv_frame *precvframe) { -struct recv_frame *precvframe = prframe; -/* Check RSSI */ process_rssi (padapter, precvframe);/* Check EVM */
drivers/staging/rtl8188eu/include/rtl8188e_recv.h +2 -1
@@ -54,7 +54,8 @@ enum rx_packet_type {void rtl8188eu_recv_hdl (struct adapter *padapter,struct recv_buf *precvbuf);void rtl8188eu_recv_tasklet (void *priv);void rtl8188e_query_rx_phy_status (struct recv_frame *fr,struct phy_stat *phy); -void rtl8188e_process_phy_info (struct adapter *padapter,void *prframe); +void rtl8188e_process_phy_info (struct adapter *padapter, +struct recv_frame *prframe);void update_recvframe_phyinfo_88e (struct recv_frame *fra,struct phy_stat *phy);void update_recvframe_attrib_88e (struct recv_frame *fra,struct recv_stat *stat);
Signature · 1 line
2.7.3
PATCH 2/8 staging:r8188eu: remove (RGTRY|BSSID)_(OFT|SZ) macros
These macros does not used.
--- drivers/staging/rtl8188eu/include/drv_types.h | 6 ------ 1 file changed, 6 deletions(-)
drivers/staging/rtl8188eu/include/drv_types.h +0 -6
@@ -104,12 +104,6 @@ struct registry_priv {bool monitor_enable; }; -/* For registry parameters */ -#define RGTRY_OFT (field) ((u32)offsetof(struct registry_priv, field)) -#define RGTRY_SZ (field) sizeof(((struct registry_priv *)0)->field) -#define BSSID_OFT (field) ((u32)offsetofT(struct wlan_bssid_ex, field)) -#define BSSID_SZ (field) sizeof(((struct wlan_bssid_ex *)0)->field) -#define MAX_CONTINUAL_URB_ERR 4struct dvobj_priv {
Signature · 1 line
2.7.3
PATCH 3/8 staging:r8188eu: remove rtw_handle_dualmac declaration
In reply to Ivan SafonovIt is a declaration of the non-existent function.
--- drivers/staging/rtl8188eu/include/drv_types.h | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/rtl8188eu/include/drv_types.h +0 -2
@@ -177,8 +177,6 @@ struct adapter {#define adapter_to_dvobj (adapter) (adapter->dvobj) -int rtw_handle_dualmac (struct adapter *adapter,bool init); -static inline u8 *myid (struct eeprom_priv *peepriv) {return peepriv->mac_addr;
Signature · 1 line
2.7.3
PATCH 4/8 staging:r8188eu: remove pkt_newalloc member of the recv_buf structure
In reply to Ivan SafonovThis member does not used.
--- drivers/staging/rtl8188eu/include/rtw_recv.h | 1 - drivers/staging/rtl8188eu/os_dep/recv_linux.c | 1 - 2 files changed, 2 deletions(-)
drivers/staging/rtl8188eu/include/rtw_recv.h +0 -1
@@ -239,7 +239,6 @@ struct recv_buf {struct recv_frame {struct list_head list;struct sk_buff *pkt; -struct sk_buff *pkt_newalloc;struct adapter *adapter;struct rx_pkt_attrib attrib;uint len;
drivers/staging/rtl8188eu/os_dep/recv_linux.c +0 -1
@@ -24,7 +24,6 @@/* alloc os related resource in struct recv_frame */ void rtw_os_recv_resource_alloc (struct recv_frame *precvframe) { - precvframe->pkt_newalloc =NULL ; precvframe->pkt =NULL ; }
Signature · 1 line
2.7.3
PATCH 5/8 staging:r8188eu: remove GEN_CMD_CODE macro
In reply to Ivan SafonovGEN_CMD_CODE is redundant macro.
--- drivers/staging/rtl8188eu/core/rtw_cmd.c | 24 +++++------ drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 14 +++--- drivers/staging/rtl8188eu/include/rtw_cmd.h | 62 +++++++++++++-------------- 3 files changed, 49 insertions(+), 51 deletions(-)
drivers/staging/rtl8188eu/core/rtw_cmd.c +12 -12
@@ -85,7 +85,7 @@ static int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)/* To decide allow or not */ if ((pcmdpriv->padapter->pwrctrlpriv.bHWPwrPindetect) && (!pcmdpriv->padapter->registrypriv.usbss_enable)) { -if (cmd_obj->cmdcode ==GEN_CMD_CODE (_Set_Drv_Extra)) { +if (cmd_obj->cmdcode == _Set_Drv_Extra_CMD_) {struct drvextra_cmd_parm *pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)cmd_obj->parmbuf;if (pdrvextra_cmd_parm->ec_id ==POWER_SAVING_CTRL_WK_CID )
@@ -93,7 +93,7 @@ static int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj) } } -if (cmd_obj->cmdcode ==GEN_CMD_CODE (_SetChannelPlan)) +if (cmd_obj->cmdcode == _SetChannelPlan_CMD_) bAllow = true; if ((!pcmdpriv->padapter->hw_init_completed && !bAllow) ||
@@ -271,7 +271,7 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid,RT_TRACE (_module_rtl871x_cmd_c_, _drv_info_, ("%s: flush network queue\n" , __func__)); -init_h2fwcmd_w_parm_no_rsp (ph2c, psurveyPara,GEN_CMD_CODE (_SiteSurvey)); +init_h2fwcmd_w_parm_no_rsp (ph2c, psurveyPara, _SiteSurvey_CMD_);/* psurveyPara->bsslimit = 48; */ psurveyPara->scan_mode = pmlmepriv->scan_mode;
@@ -489,7 +489,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) pcmd->cmdsz =get_wlan_bssid_ex_sz (psecnetwork);/* get cmdsz before endian conversion */ INIT_LIST_HEAD (&pcmd->list); - pcmd->cmdcode = _JoinBss_CMD_;/* GEN_CMD_CODE(_JoinBss) */ + pcmd->cmdcode = _JoinBss_CMD_; pcmd->parmbuf = (unsigned char *)psecnetwork; pcmd->rsp =NULL ; pcmd->rspsz =0 ;
@@ -684,7 +684,7 @@ u8 rtw_addbareq_cmd(struct adapter *padapter, u8 tid, u8 *addr) paddbareq_parm->tid = tid;memcpy (paddbareq_parm->addr, addr,ETH_ALEN ); -init_h2fwcmd_w_parm_no_rsp (ph2c, paddbareq_parm,GEN_CMD_CODE (_AddBAReq)); +init_h2fwcmd_w_parm_no_rsp (ph2c, paddbareq_parm, _AddBAReq_CMD_);/* DBG_88E("rtw_addbareq_cmd, tid =%d\n", tid); */
@@ -722,7 +722,7 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *padapter) pdrvextra_cmd_parm->type_size =0 ; pdrvextra_cmd_parm->pbuf = (u8 *)padapter; -init_h2fwcmd_w_parm_no_rsp (ph2c, pdrvextra_cmd_parm,GEN_CMD_CODE (_Set_Drv_Extra)); +init_h2fwcmd_w_parm_no_rsp (ph2c, pdrvextra_cmd_parm, _Set_Drv_Extra_CMD_);/* rtw_enqueue_cmd(pcmdpriv, ph2c); */
@@ -765,7 +765,7 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue) goto exit; } -init_h2fwcmd_w_parm_no_rsp (pcmdobj, setChannelPlan_param,GEN_CMD_CODE (_SetChannelPlan)); +init_h2fwcmd_w_parm_no_rsp (pcmdobj, setChannelPlan_param, _SetChannelPlan_CMD_); res =rtw_enqueue_cmd (pcmdpriv, pcmdobj); }else {/* no need to enqueue, do the cmd hdl directly and free cmd parameter */
@@ -934,7 +934,7 @@ u8 rtw_lps_ctrl_wk_cmd(struct adapter *padapter, u8 lps_ctrl_type, u8 enqueue) pdrvextra_cmd_parm->type_size = lps_ctrl_type; pdrvextra_cmd_parm->pbuf =NULL ; -init_h2fwcmd_w_parm_no_rsp (ph2c, pdrvextra_cmd_parm,GEN_CMD_CODE (_Set_Drv_Extra)); +init_h2fwcmd_w_parm_no_rsp (ph2c, pdrvextra_cmd_parm, _Set_Drv_Extra_CMD_); res =rtw_enqueue_cmd (pcmdpriv, ph2c); }else {
@@ -976,7 +976,7 @@ u8 rtw_rpt_timer_cfg_cmd(struct adapter *padapter, u16 min_time) pdrvextra_cmd_parm->ec_id =RTP_TIMER_CFG_WK_CID ; pdrvextra_cmd_parm->type_size = min_time; pdrvextra_cmd_parm->pbuf =NULL ; -init_h2fwcmd_w_parm_no_rsp (ph2c, pdrvextra_cmd_parm,GEN_CMD_CODE (_Set_Drv_Extra)); +init_h2fwcmd_w_parm_no_rsp (ph2c, pdrvextra_cmd_parm, _Set_Drv_Extra_CMD_); res =rtw_enqueue_cmd (pcmdpriv, ph2c); exit:
@@ -1018,7 +1018,7 @@ u8 rtw_antenna_select_cmd(struct adapter *padapter, u8 antenna, u8 enqueue) pdrvextra_cmd_parm->ec_id =ANT_SELECT_WK_CID ; pdrvextra_cmd_parm->type_size = antenna; pdrvextra_cmd_parm->pbuf =NULL ; -init_h2fwcmd_w_parm_no_rsp (ph2c, pdrvextra_cmd_parm,GEN_CMD_CODE (_Set_Drv_Extra)); +init_h2fwcmd_w_parm_no_rsp (ph2c, pdrvextra_cmd_parm, _Set_Drv_Extra_CMD_); res =rtw_enqueue_cmd (pcmdpriv, ph2c); }else {
@@ -1046,7 +1046,7 @@ u8 rtw_ps_cmd(struct adapter *padapter) pdrvextra_cmd_parm->ec_id =POWER_SAVING_CTRL_WK_CID ; pdrvextra_cmd_parm->pbuf =NULL ; -init_h2fwcmd_w_parm_no_rsp (ppscmd, pdrvextra_cmd_parm,GEN_CMD_CODE (_Set_Drv_Extra)); +init_h2fwcmd_w_parm_no_rsp (ppscmd, pdrvextra_cmd_parm, _Set_Drv_Extra_CMD_);return rtw_enqueue_cmd (pcmdpriv, ppscmd); }
@@ -1117,7 +1117,7 @@ u8 rtw_chk_hi_queue_cmd(struct adapter *padapter) pdrvextra_cmd_parm->type_size =0 ; pdrvextra_cmd_parm->pbuf =NULL ; -init_h2fwcmd_w_parm_no_rsp (ph2c, pdrvextra_cmd_parm,GEN_CMD_CODE (_Set_Drv_Extra)); +init_h2fwcmd_w_parm_no_rsp (ph2c, pdrvextra_cmd_parm, _Set_Drv_Extra_CMD_); res =rtw_enqueue_cmd (pcmdpriv, ph2c); exit:
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +7 -7
@@ -4240,7 +4240,7 @@ void report_survey_event(struct adapter *padapter,INIT_LIST_HEAD (&pcmd_obj->list); - pcmd_obj->cmdcode =GEN_CMD_CODE (_Set_MLME_EVT); + pcmd_obj->cmdcode = _Set_MLME_EVT_CMD_; pcmd_obj->cmdsz = cmdsz; pcmd_obj->parmbuf = pevtcmd;
@@ -4290,7 +4290,7 @@ void report_surveydone_event(struct adapter *padapter)INIT_LIST_HEAD (&pcmd_obj->list); - pcmd_obj->cmdcode =GEN_CMD_CODE (_Set_MLME_EVT); + pcmd_obj->cmdcode = _Set_MLME_EVT_CMD_; pcmd_obj->cmdsz = cmdsz; pcmd_obj->parmbuf = pevtcmd;
@@ -4334,7 +4334,7 @@ void report_join_res(struct adapter *padapter, int res)INIT_LIST_HEAD (&pcmd_obj->list); - pcmd_obj->cmdcode =GEN_CMD_CODE (_Set_MLME_EVT); + pcmd_obj->cmdcode = _Set_MLME_EVT_CMD_; pcmd_obj->cmdsz = cmdsz; pcmd_obj->parmbuf = pevtcmd;
@@ -4385,7 +4385,7 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsiINIT_LIST_HEAD (&pcmd_obj->list); - pcmd_obj->cmdcode =GEN_CMD_CODE (_Set_MLME_EVT); + pcmd_obj->cmdcode = _Set_MLME_EVT_CMD_; pcmd_obj->cmdsz = cmdsz; pcmd_obj->parmbuf = pevtcmd;
@@ -4438,7 +4438,7 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, intINIT_LIST_HEAD (&pcmd_obj->list); - pcmd_obj->cmdcode =GEN_CMD_CODE (_Set_MLME_EVT); + pcmd_obj->cmdcode = _Set_MLME_EVT_CMD_; pcmd_obj->cmdsz = cmdsz; pcmd_obj->parmbuf = pevtcmd;
@@ -4849,7 +4849,7 @@ void survey_timer_hdl(unsigned long data) goto exit_survey_timer_hdl; } -init_h2fwcmd_w_parm_no_rsp (ph2c, psurveyPara,GEN_CMD_CODE (_SiteSurvey)); +init_h2fwcmd_w_parm_no_rsp (ph2c, psurveyPara, _SiteSurvey_CMD_);rtw_enqueue_cmd (pcmdpriv, ph2c); }
@@ -5425,7 +5425,7 @@ u8 set_tx_beacon_cmd(struct adapter *padapter) pmlmeinfo->hidden_ssid_mode); ptxBeacon_parm->IELength += len_diff; -init_h2fwcmd_w_parm_no_rsp (ph2c, ptxBeacon_parm,GEN_CMD_CODE (_TX_Beacon)); +init_h2fwcmd_w_parm_no_rsp (ph2c, ptxBeacon_parm, _TX_Beacon_CMD_); res =rtw_enqueue_cmd (pcmdpriv, ph2c);
drivers/staging/rtl8188eu/include/rtw_cmd.h +30 -32
80 lines not on this page · raw message
Signature · 1 line
2.7.3
PATCH 6/8 staging:r8188eu: remove GEN_EVT_CODE macro
In reply to Ivan SafonovGEN_EVT_CODE is redundant macro.
--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 10 ++--- drivers/staging/rtl8188eu/include/rtw_event.h | 2 - drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 52 ++++++++++++------------ 3 files changed, 31 insertions(+), 33 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +5 -5
@@ -4249,7 +4249,7 @@ void report_survey_event(struct adapter *padapter, pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd); pc2h_evt_hdr->len =sizeof (struct survey_event ); - pc2h_evt_hdr->ID =GEN_EVT_CODE (_Survey); + pc2h_evt_hdr->ID = _Survey_EVT_; pc2h_evt_hdr->seq =atomic_inc_return (&pmlmeext->event_seq); psurvey_evt = (struct survey_event *)(pevtcmd +sizeof (struct C2HEvent_Header ));
@@ -4299,7 +4299,7 @@ void report_surveydone_event(struct adapter *padapter) pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd); pc2h_evt_hdr->len =sizeof (struct surveydone_event ); - pc2h_evt_hdr->ID =GEN_EVT_CODE (_SurveyDone); + pc2h_evt_hdr->ID = _SurveyDone_EVT_; pc2h_evt_hdr->seq =atomic_inc_return (&pmlmeext->event_seq); psurveydone_evt = (struct surveydone_event *)(pevtcmd +sizeof (struct C2HEvent_Header ));
@@ -4343,7 +4343,7 @@ void report_join_res(struct adapter *padapter, int res) pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd); pc2h_evt_hdr->len =sizeof (struct joinbss_event ); - pc2h_evt_hdr->ID =GEN_EVT_CODE (_JoinBss); + pc2h_evt_hdr->ID = _JoinBss_EVT_; pc2h_evt_hdr->seq =atomic_inc_return (&pmlmeext->event_seq); pjoinbss_evt = (struct joinbss_event *)(pevtcmd +sizeof (struct C2HEvent_Header ));
@@ -4394,7 +4394,7 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsi pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd); pc2h_evt_hdr->len =sizeof (struct stadel_event ); - pc2h_evt_hdr->ID =GEN_EVT_CODE (_DelSTA); + pc2h_evt_hdr->ID = _DelSTA_EVT_; pc2h_evt_hdr->seq =atomic_inc_return (&pmlmeext->event_seq); pdel_sta_evt = (struct stadel_event *)(pevtcmd +sizeof (struct C2HEvent_Header ));
@@ -4447,7 +4447,7 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, int pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd); pc2h_evt_hdr->len =sizeof (struct stassoc_event ); - pc2h_evt_hdr->ID =GEN_EVT_CODE (_AddSTA); + pc2h_evt_hdr->ID = _AddSTA_EVT_; pc2h_evt_hdr->seq =atomic_inc_return (&pmlmeext->event_seq); padd_sta_evt = (struct stassoc_event *)(pevtcmd +sizeof (struct C2HEvent_Header ));
drivers/staging/rtl8188eu/include/rtw_event.h +0 -2
@@ -71,8 +71,6 @@ struct stadel_event {int mac_id; }; -#define GEN_EVT_CODE (event) event ## _EVT_ -struct fwevent {u32 parmsize;void (*event_callback)(struct adapter *dev,u8 *pbuf);
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h +26 -26
58 lines not on this page · raw message
Signature · 1 line
2.7.3
PATCH 7/8 staging:r8188eu: remove GEN_DRV_CMD_HANDLER macro
In reply to Ivan SafonovThis macro does not used.
--- drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 1 - 1 file changed, 1 deletion(-)
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h +0 -1
@@ -625,7 +625,6 @@ u8 led_blink_hdl(struct adapter *padapter, unsigned char *pbuf);u8 set_csa_hdl (struct adapter *padapter,unsigned char *pbuf);u8 tdls_hdl (struct adapter *padapter,unsigned char *pbuf); -#define GEN_DRV_CMD_HANDLER (size, cmd) {size, &cmd ## _hdl},#define GEN_MLME_EXT_HANDLER (size, cmd) {size, cmd},#ifdef _RTW_CMD_C_
Signature · 1 line
2.7.3
PATCH 8/8 staging:r8188eu: remove GEN_MLME_EXT_HANDLER macro
In reply to Ivan SafonovGEN_MLME_EXT_HANDLER is redundant macro.
--- drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 32 +++++++++++------------- 1 file changed, 15 insertions(+), 17 deletions(-)
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h +15 -17
@@ -625,26 +625,24 @@ u8 led_blink_hdl(struct adapter *padapter, unsigned char *pbuf);u8 set_csa_hdl (struct adapter *padapter,unsigned char *pbuf);u8 tdls_hdl (struct adapter *padapter,unsigned char *pbuf); -#define GEN_MLME_EXT_HANDLER (size, cmd) {size, cmd}, -#ifdef _RTW_CMD_C_static struct cmd_hdl wlancmds[] = { - GEN_MLME_EXT_HANDLER(sizeof(struct wlan_bssid_ex), join_cmd_hdl) - GEN_MLME_EXT_HANDLER(sizeof(struct disconnect_parm), disconnect_hdl) - GEN_MLME_EXT_HANDLER(sizeof(struct wlan_bssid_ex), createbss_hdl) - GEN_MLME_EXT_HANDLER(sizeof(struct setopmode_parm), setopmode_hdl) - GEN_MLME_EXT_HANDLER(sizeof(struct sitesurvey_parm), sitesurvey_cmd_hdl) - GEN_MLME_EXT_HANDLER(sizeof(struct setauth_parm), setauth_hdl) - GEN_MLME_EXT_HANDLER(sizeof(struct setkey_parm), setkey_hdl) - GEN_MLME_EXT_HANDLER(sizeof(struct set_stakey_parm), set_stakey_hdl) - GEN_MLME_EXT_HANDLER(sizeof(struct set_assocsta_parm), NULL) - GEN_MLME_EXT_HANDLER(sizeof(struct addBaReq_parm), add_ba_hdl) - GEN_MLME_EXT_HANDLER(sizeof(struct set_ch_parm), set_ch_hdl) - GEN_MLME_EXT_HANDLER(sizeof(struct wlan_bssid_ex), tx_beacon_hdl) - GEN_MLME_EXT_HANDLER(0, mlme_evt_hdl) - GEN_MLME_EXT_HANDLER(0, rtw_drvextra_cmd_hdl) -GEN_MLME_EXT_HANDLER (sizeof (struct SetChannelPlan_param ), set_chplan_hdl) + {sizeof (struct wlan_bssid_ex ), join_cmd_hdl}, + {sizeof (struct disconnect_parm ), disconnect_hdl}, + {sizeof (struct wlan_bssid_ex ), createbss_hdl}, + {sizeof (struct setopmode_parm ), setopmode_hdl}, + {sizeof (struct sitesurvey_parm ), sitesurvey_cmd_hdl}, + {sizeof (struct setauth_parm ), setauth_hdl}, + {sizeof (struct setkey_parm ), setkey_hdl}, + {sizeof (struct set_stakey_parm ), set_stakey_hdl}, + {sizeof (struct set_assocsta_parm ),NULL }, + {sizeof (struct addBaReq_parm ), add_ba_hdl}, + {sizeof (struct set_ch_parm ), set_ch_hdl}, + {sizeof (struct wlan_bssid_ex ), tx_beacon_hdl}, + {0 , mlme_evt_hdl}, + {0 , rtw_drvextra_cmd_hdl}, + {sizeof (struct SetChannelPlan_param ), set_chplan_hdl} };#endif
Signature · 1 line
2.7.3