Remove dummy and wrapper functions.
cover Remove dummy and wrapper functions.
navin patidar (42):
staging: rtl8188eu: Remove dummy function odm_DynamicTxPower()
staging: rtl8188eu: Remove dummy function CheckFwRsvdPageContent()
staging: rtl8188eu: Remove dummy rtl8188e_GetHalODMVar() and its
wrapper
staging: rtl8188eu: Remove dummy rtl8188e_start_thread() and its
wrapper
staging: rtl8188eu: Remove dummy rtl8188e_stop_thread() and its
wrapper
staging: rtl8188eu: Remove dummy function Hal_InitChannelPlan()
staging: rtl8188eu: Remove dummy rtl8188eu_free_xmit_priv() and its
wrapper
staging: rtl8188eu: Remove function _rtw_memset()
staging: rtl8188eu: Remove rtw_mfree2d(), wrapper for kfree()
staging: rtl8188eu: Remove unused function rtw_list_insert_head()
staging: rtl8188eu: Remove rtw_list_insert_tail(), wrapper for
list_add_tail()
staging: rtl8188eu: Remove function rtw_end_of_queue_search()
staging: rtl8188eu: Remove rtw_is_list_empty(), wrapper for
list_emty()
staging: rtl8188eu: Remove _rtw_init_listhead(), wrapper for
INIT_LIST_HEAD()
staging: rtl8188eu: Remove unused function rtw_sleep_schedulable()
staging: rtl8188eu: Use kstrtoul() for string to long conversion
staging: rtl8188eu:Remove rtw_zmalloc(), wrapper for kzalloc()
staging: rtl8188eu: Remove unused function rtw_division64()
staging: rtl8188eu: Remove unused function rtw_get_time_interval_ms()
staging: rtl8188eu: osdep_service.h: Remove unused macro, enum and
variables
staging: rtl8188eu: Replace rtw_list_delete() with list_del_init()
staging: rtl8188eu: osdep_service.c: Remove unused macro
staging: rtl8188eu: Replace _rtw_queue_empty() with list_empty()
staging: rtl8188eu: Replace _cancel_workitem_sync() with
cancel_work_sync()
staging: rtl8188eu: Remove unused inline function _RND512()
staging: rtl8188eu: Replace _cancel_timer_ex() with del_timer_sync()
staging: rtl8188eu: Use cpu_to_be32() instead of RTW_PUT_BE32()
staging: rtl8188eu: Use cpu_to_be16() instead of RTW_PUT_BE16()
staging: rtl8188eu: Use get_unaligned_be16() instead of
RTW_GET_BE16()
staging: rtl8188eu: Remove unused inline function bitshift()
staging: rtl8188eu: Use get_unaligned_le16() instead of
RTW_GET_LE16() staging: rtl8188eu: Use cpu_to_le16() insted of RTW_PUT_LE16()
staging: rtl8188eu: osdep_service.h: Remove unused function
definations
staging: rtl8188eu: Remove unused inline function _RND256()
staging: rtl8188eu: Use round_up() instead of _RND128()
staging: rtl8188eu: Use round_up() instead of _RND8()
staging: rtl8188eu: Use round_up() instead of _RND4()
staging: rtl8188eu: osdep_service.h: Remove unused macros
staging: rtl8188eu: Use round_up() instead of RND4()
staging: rtl8188eu: Remove function thread_enter()
staging: rtl8188eu: Remove function flush_signals_thread()
staging: rtl8188eu: Replace _cancel_timer() with del_timer_sync()
drivers/staging/rtl8188eu/core/rtw_ap.c | 52 ++--- drivers/staging/rtl8188eu/core/rtw_cmd.c | 159 ++++++++-------- drivers/staging/rtl8188eu/core/rtw_debug.c | 2 +- drivers/staging/rtl8188eu/core/rtw_efuse.c | 24 +-- drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 33 ++-- drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 18 +- drivers/staging/rtl8188eu/core/rtw_led.c | 52 ++--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 85 ++++----- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 188 +++++++++--------- drivers/staging/rtl8188eu/core/rtw_mp.c | 28 +-- drivers/staging/rtl8188eu/core/rtw_p2p.c | 142 ++++++-------- drivers/staging/rtl8188eu/core/rtw_recv.c | 52 ++--- drivers/staging/rtl8188eu/core/rtw_security.c | 34 ++-- drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 54 +++--- drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 8 +- drivers/staging/rtl8188eu/core/rtw_xmit.c | 115 ++++++------ drivers/staging/rtl8188eu/hal/hal_com.c | 2 +- drivers/staging/rtl8188eu/hal/hal_intf.c | 29 --- drivers/staging/rtl8188eu/hal/odm.c | 14 -- drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 12 +- drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 4 +- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 21 +-- drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 4 +- drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 24 +-- drivers/staging/rtl8188eu/hal/usb_halinit.c | 7 +- drivers/staging/rtl8188eu/include/hal_intf.h | 12 -- drivers/staging/rtl8188eu/include/odm_precomp.h | 1 - drivers/staging/rtl8188eu/include/osdep_service.h | 161 ---------------- drivers/staging/rtl8188eu/include/rtl8188e_cmd.h | 1 - drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 1 - drivers/staging/rtl8188eu/include/rtl8188e_xmit.h | 1 - drivers/staging/rtl8188eu/include/rtw_cmd.h | 2 +- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 209 +++++++++------------ drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 8 +- drivers/staging/rtl8188eu/os_dep/os_intfs.c | 18 +- drivers/staging/rtl8188eu/os_dep/osdep_service.c | 110 +---------- drivers/staging/rtl8188eu/os_dep/recv_linux.c | 4 +- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 4 +- drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 8 +- drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 4 +- 41 files changed, 638 insertions(+), 1071 deletions(-)
--
1.7.10.4
PATCH 1/42 staging: rtl8188eu: Remove dummy function odm_DynamicTxPower()
--- drivers/staging/rtl8188eu/hal/odm.c | 14 -------------- drivers/staging/rtl8188eu/include/odm_precomp.h | 1 - 2 files changed, 15 deletions(-)
drivers/staging/rtl8188eu/hal/odm.c +0 -14
@@ -221,7 +221,6 @@ void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm)ODM_TXPowerTrackingCheck (pDM_Odm);odm_EdcaTurboCheck (pDM_Odm); -odm_DynamicTxPower (pDM_Odm); }/* Init /.. Fixed HW value. Only init time. */
@@ -1110,19 +1109,6 @@ void odm_DynamicTxPowerInit(struct odm_dm_struct *pDM_Odm) pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal; } -void odm_DynamicTxPower (struct odm_dm_struct *pDM_Odm) -{ -/* For AP/ADSL use struct rtl8192cd_priv * */ -/* For CE/NIC use struct adapter * */ - -if (!(pDM_Odm->SupportAbility &ODM_BB_DYNAMIC_TXPWR )) -return ; - -/* 2012/01/12 MH According to Luke's suggestion, only high power will support the feature. */ -if (!pDM_Odm->ExtPA) -return ; -} -/* 3============================================================ */ /* 3 RSSI Monitor */ /* 3============================================================ */
drivers/staging/rtl8188eu/include/odm_precomp.h +0 -1
@@ -71,7 +71,6 @@ void odm_RefreshRateAdaptiveMaskMP(struct odm_dm_struct *pDM_Odm);void odm_DynamicBBPowerSaving (struct odm_dm_struct *pDM_Odm);void odm_SwAntDivChkAntSwitch (struct odm_dm_struct *pDM_Odm,u8 Step);void odm_EdcaTurboCheck (struct odm_dm_struct *pDM_Odm); -void odm_DynamicTxPower (struct odm_dm_struct *pDM_Odm);void odm_CommonInfoSelfInit (struct odm_dm_struct *pDM_Odm);void odm_RSSIMonitorCheck (struct odm_dm_struct *pDM_Odm);void odm_RefreshRateAdaptiveMask (struct odm_dm_struct *pDM_Odm);
Signature · 1 line
1.7.10.4
PATCH 2/42 staging: rtl8188eu: Remove dummy function CheckFwRsvdPageContent()
In reply to navin patidar--- drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 6 ------ drivers/staging/rtl8188eu/include/rtl8188e_cmd.h | 1 - 2 files changed, 7 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c +0 -6
@@ -476,12 +476,6 @@ static void ConstructProbeRsp(struct adapter *adapt, u8 *pframe, u32 *pLength, u *pLength = pktlen; } -/* To check if reserved page content is destroyed by beacon because beacon is too large. */ -/* 2010.06.23. Added by tynli. */ -void CheckFwRsvdPageContent (struct adapter *Adapter) -{ -} -/* */ /* Description: Fill the reserved packets that FW will use to RSVD page. */ /* Now we just send 4 types packet to rsvd page. */
drivers/staging/rtl8188eu/include/rtl8188e_cmd.h +0 -1
@@ -116,7 +116,6 @@ void rtl8188e_Add_RateATid(struct adapter *padapter, u32 bitmap, u8 arg,void rtl8188e_set_p2p_ps_offload_cmd (struct adapter *adapt,u8 p2p_ps_state);#endif /* CONFIG_88EU_P2P */ -void CheckFwRsvdPageContent (struct adapter *adapt);void rtl8188e_set_FwMediaStatus_cmd (struct adapter *adapt,__le16 mstatus_rpt);#endif /* __RTL8188E_CMD_H__ */
Signature · 1 line
1.7.10.4
PATCH 3/42 staging: rtl8188eu: Remove dummy rtl8188e_GetHalODMVar() and its wrapper
In reply to navin patidar--- drivers/staging/rtl8188eu/hal/hal_intf.c | 9 --------- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 5 ----- drivers/staging/rtl8188eu/include/hal_intf.h | 6 ------ 3 files changed, 20 deletions(-)
drivers/staging/rtl8188eu/hal/hal_intf.c +0 -9
@@ -156,15 +156,6 @@ void rtw_hal_set_odm_var(struct adapter *adapt, val1, set); } -void rtw_hal_get_odm_var (struct adapter *adapt, -enum hal_odm_variable var,void *val1, -bool set) -{ -if (adapt->HalFunc.GetHalODMVarHandler) - adapt->HalFunc.GetHalODMVarHandler (adapt, var, - val1, set); -} -void rtw_hal_enable_interrupt (struct adapter *adapt) {if (adapt->HalFunc.enable_interrupt)
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +0 -5
@@ -544,10 +544,6 @@ static void rtl8188e_read_chip_version(struct adapter *padapter)ReadChipVersion8188E (padapter); } -static void rtl8188e_GetHalODMVar (struct adapter *Adapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet) -{ -} -static void rtl8188e_SetHalODMVar (struct adapter *Adapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet) {struct hal_data_8188e *pHalData =GET_HAL_DATA (Adapter);
@@ -622,7 +618,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) pHalFunc->sreset_init_value = &sreset_init_value; pHalFunc->sreset_get_wifi_status = &sreset_get_wifi_status; - pHalFunc->GetHalODMVarHandler = &rtl8188e_GetHalODMVar; pHalFunc->SetHalODMVarHandler = &rtl8188e_SetHalODMVar; pHalFunc->IOL_exec_cmds_sync = &rtl8188e_IOL_exec_cmds_sync;
drivers/staging/rtl8188eu/include/hal_intf.h +0 -6
@@ -197,9 +197,6 @@ struct hal_ops {enum hal_def_variable eVariable, void *pValue); -void (*GetHalODMVarHandler)(struct adapter *padapter, -enum hal_odm_variable eVariable, -void *pValue1,bool bSet);void (*SetHalODMVarHandler)(struct adapter *padapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet);
@@ -295,9 +292,6 @@ u8 rtw_hal_get_def_var(struct adapter *padapter,void rtw_hal_set_odm_var (struct adapter *padapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet); -void rtw_hal_get_odm_var (struct adapter *padapter, -enum hal_odm_variable eVariable, -void *pValue1,bool bSet);void rtw_hal_enable_interrupt (struct adapter *padapter);void rtw_hal_disable_interrupt (struct adapter *padapter);
Signature · 1 line
1.7.10.4
PATCH 4/42 staging: rtl8188eu: Remove dummy rtl8188e_start_thread() and its wrapper
In reply to navin patidar--- drivers/staging/rtl8188eu/hal/hal_intf.c | 7 ------- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 5 ----- drivers/staging/rtl8188eu/include/hal_intf.h | 2 -- drivers/staging/rtl8188eu/os_dep/os_intfs.c | 1 - 4 files changed, 15 deletions(-)
drivers/staging/rtl8188eu/hal/hal_intf.c +0 -7
@@ -263,13 +263,6 @@ void rtw_hal_add_ra_tid(struct adapter *adapt, u32 bitmap, u8 arg, }/* Start specifical interface thread */ -void rtw_hal_start_thread (struct adapter *adapt) -{ -if (adapt->HalFunc.run_thread) - adapt->HalFunc.run_thread (adapt); -} - -/* Start specifical interface thread */ void rtw_hal_stop_thread (struct adapter *adapt) {if (adapt->HalFunc.cancel_thread)
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +0 -5
@@ -573,10 +573,6 @@ static void rtl8188e_SetHalODMVar(struct adapter *Adapter, enum hal_odm_variable } } -void rtl8188e_start_thread (struct adapter *padapter) -{ -} -void rtl8188e_stop_thread (struct adapter *padapter) { }
@@ -605,7 +601,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) pHalFunc->hal_dm_watchdog = &rtl8188e_HalDmWatchDog; pHalFunc->Add_RateATid = &rtl8188e_Add_RateATid; - pHalFunc->run_thread = &rtl8188e_start_thread; pHalFunc->cancel_thread = &rtl8188e_stop_thread; pHalFunc->AntDivBeforeLinkHandler = &AntDivBeforeLink8188E;
drivers/staging/rtl8188eu/include/hal_intf.h +0 -2
@@ -207,7 +207,6 @@ struct hal_ops {void (*Add_RateATid)(struct adapter *adapter,u32 bitmap,u8 arg,u8 rssi_level); -void (*run_thread)(struct adapter *adapter);void (*cancel_thread)(struct adapter *adapter);u8 (*AntDivBeforeLinkHandler)(struct adapter *adapter);
@@ -313,7 +312,6 @@ void rtw_hal_update_ra_mask(struct adapter *padapter, u32 mac_id, u8 level);void rtw_hal_add_ra_tid (struct adapter *adapt,u32 bitmap,u8 arg,u8 level);void rtw_hal_clone_data (struct adapter *dst_adapt,struct adapter *src_adapt); -void rtw_hal_start_thread (struct adapter *padapter);void rtw_hal_stop_thread (struct adapter *padapter);void rtw_hal_bcn_related_reg_setting (struct adapter *padapter);
drivers/staging/rtl8188eu/os_dep/os_intfs.c +0 -1
@@ -749,7 +749,6 @@ u32 rtw_start_drv_threads(struct adapter *padapter)else _rtw_down_sema (&padapter->cmdpriv.terminate_cmdthread_sema);/* wait for cmd_thread to run */ -rtw_hal_start_thread (padapter);return _status; }
Signature · 1 line
1.7.10.4
PATCH 5/42 staging: rtl8188eu: Remove dummy rtl8188e_stop_thread() and its wrapper
In reply to navin patidar--- drivers/staging/rtl8188eu/hal/hal_intf.c | 7 ------- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 5 ----- drivers/staging/rtl8188eu/include/hal_intf.h | 2 -- drivers/staging/rtl8188eu/os_dep/os_intfs.c | 1 - 4 files changed, 15 deletions(-)
drivers/staging/rtl8188eu/hal/hal_intf.c +0 -7
@@ -262,13 +262,6 @@ void rtw_hal_add_ra_tid(struct adapter *adapt, u32 bitmap, u8 arg, rssi_level); } -/* Start specifical interface thread */ -void rtw_hal_stop_thread (struct adapter *adapt) -{ -if (adapt->HalFunc.cancel_thread) - adapt->HalFunc.cancel_thread (adapt); -} -u32 rtw_hal_read_bbreg (struct adapter *adapt,u32 regaddr,u32 bitmask) {u32 data =0 ;
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +0 -5
@@ -573,10 +573,6 @@ static void rtl8188e_SetHalODMVar(struct adapter *Adapter, enum hal_odm_variable } } -void rtl8188e_stop_thread (struct adapter *padapter) -{ -} -static void hal_notch_filter_8188e (struct adapter *adapter,bool enable) {if (enable) {
@@ -601,7 +597,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) pHalFunc->hal_dm_watchdog = &rtl8188e_HalDmWatchDog; pHalFunc->Add_RateATid = &rtl8188e_Add_RateATid; - pHalFunc->cancel_thread = &rtl8188e_stop_thread; pHalFunc->AntDivBeforeLinkHandler = &AntDivBeforeLink8188E; pHalFunc->AntDivCompareHandler = &AntDivCompare8188E;
drivers/staging/rtl8188eu/include/hal_intf.h +0 -2
@@ -207,7 +207,6 @@ struct hal_ops {void (*Add_RateATid)(struct adapter *adapter,u32 bitmap,u8 arg,u8 rssi_level); -void (*cancel_thread)(struct adapter *adapter);u8 (*AntDivBeforeLinkHandler)(struct adapter *adapter); void (*AntDivCompareHandler)(struct adapter *adapter,
@@ -312,7 +311,6 @@ void rtw_hal_update_ra_mask(struct adapter *padapter, u32 mac_id, u8 level);void rtw_hal_add_ra_tid (struct adapter *adapt,u32 bitmap,u8 arg,u8 level);void rtw_hal_clone_data (struct adapter *dst_adapt,struct adapter *src_adapt); -void rtw_hal_stop_thread (struct adapter *padapter);void rtw_hal_bcn_related_reg_setting (struct adapter *padapter);
drivers/staging/rtl8188eu/os_dep/os_intfs.c +0 -1
@@ -761,7 +761,6 @@ void rtw_stop_drv_threads(struct adapter *padapter)if (padapter->cmdThread)_rtw_down_sema (&padapter->cmdpriv.terminate_cmdthread_sema); -rtw_hal_stop_thread (padapter); }static u8 rtw_init_default_value (struct adapter *padapter)
Signature · 1 line
1.7.10.4
PATCH 6/42 staging: rtl8188eu: Remove dummy function Hal_InitChannelPlan()
In reply to navin patidar--- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 4 ---- drivers/staging/rtl8188eu/hal/usb_halinit.c | 4 ---- drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 1 - 3 files changed, 9 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +0 -4
@@ -1079,10 +1079,6 @@ void Hal_ReadThermalMeter_88E(struct adapter *Adapter, u8 *PROMContent, bool AutDBG_88E ("ThermalMeter = 0x%x\n" , pHalData->EEPROMThermalMeter); } -void Hal_InitChannelPlan (struct adapter *padapter) -{ -} -bool HalDetectPwrDownMode88E (struct adapter *Adapter) {u8 tmpvalue =0 ;
drivers/staging/rtl8188eu/hal/usb_halinit.c +0 -4
@@ -1149,10 +1149,6 @@ readAdapterInfo_8188EU(Hal_EfuseParseBoardType88E (adapt, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);Hal_ReadThermalMeter_88E (adapt, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag); -/* */ -/* The following part initialize some vars by PG info. */ -/* */ -Hal_InitChannelPlan (adapt); } static void _ReadPROMContent(
drivers/staging/rtl8188eu/include/rtl8188e_hal.h +0 -1
@@ -457,7 +457,6 @@ void Hal_ReadPowerSavingMode88E(struct adapter *pAdapter, u8 *hwinfo,bool HalDetectPwrDownMode88E (struct adapter *Adapter); -void Hal_InitChannelPlan (struct adapter *padapter);void rtl8188e_set_hal_ops (struct hal_ops *pHalFunc);/* register */
Signature · 1 line
1.7.10.4
PATCH 7/42 staging: rtl8188eu: Remove dummy rtl8188eu_free_xmit_priv() and its wrapper
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_xmit.c | 3 --- drivers/staging/rtl8188eu/hal/hal_intf.c | 6 ------ drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 4 ---- drivers/staging/rtl8188eu/hal/usb_halinit.c | 1 - drivers/staging/rtl8188eu/include/hal_intf.h | 2 -- drivers/staging/rtl8188eu/include/rtl8188e_xmit.h | 1 - 6 files changed, 17 deletions(-)
drivers/staging/rtl8188eu/core/rtw_xmit.c +0 -3
@@ -233,9 +233,6 @@ void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv)u32 max_xmit_extbuf_size =MAX_XMIT_EXTBUF_SZ ;u32 num_xmit_extbuf =NR_XMIT_EXTBUFF ; - -rtw_hal_free_xmit_priv (padapter); -if (pxmitpriv->pxmit_frame_buf ==NULL )return ;
drivers/staging/rtl8188eu/hal/hal_intf.c +0 -6
@@ -214,12 +214,6 @@ s32 rtw_hal_init_xmit_priv(struct adapter *adapt)return _FAIL; } -void rtw_hal_free_xmit_priv (struct adapter *adapt) -{ -if (adapt->HalFunc.free_xmit_priv !=NULL ) - adapt->HalFunc.free_xmit_priv (adapt); -} -s32 rtw_hal_init_recv_priv (struct adapter *adapt) {if (adapt->HalFunc.init_recv_priv)
drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c +0 -4
@@ -35,10 +35,6 @@ s32 rtl8188eu_init_xmit_priv(struct adapter *adapt)return _SUCCESS; } -void rtl8188eu_free_xmit_priv (struct adapter *adapt) -{ -} -static u8 urb_zero_packet_chk (struct adapter *adapt,int sz) {u8 set_tx_desc_offset;
drivers/staging/rtl8188eu/hal/usb_halinit.c +0 -1
@@ -2223,7 +2223,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) halfunc->inirp_deinit = &rtl8188eu_inirp_deinit; halfunc->init_xmit_priv = &rtl8188eu_init_xmit_priv; - halfunc->free_xmit_priv = &rtl8188eu_free_xmit_priv; halfunc->init_recv_priv = &rtl8188eu_init_recv_priv; halfunc->free_recv_priv = &rtl8188eu_free_recv_priv;
drivers/staging/rtl8188eu/include/hal_intf.h +0 -2
@@ -157,7 +157,6 @@ struct hal_ops {u32 (*inirp_deinit)(struct adapter *padapter);s32 (*init_xmit_priv)(struct adapter *padapter); -void (*free_xmit_priv)(struct adapter *padapter);s32 (*init_recv_priv)(struct adapter *padapter);void (*free_recv_priv)(struct adapter *padapter);
@@ -302,7 +301,6 @@ s32 rtw_hal_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe);s32 rtw_hal_init_xmit_priv (struct adapter *padapter); -void rtw_hal_free_xmit_priv (struct adapter *padapter);s32 rtw_hal_init_recv_priv (struct adapter *padapter);void rtw_hal_free_recv_priv (struct adapter *padapter);
drivers/staging/rtl8188eu/include/rtl8188e_xmit.h +0 -1
@@ -159,7 +159,6 @@ struct txrpt_ccx_88e {void rtl8188e_fill_fake_txdesc (struct adapter *padapter,u8 *pDesc,u32 BufferLen,u8 IsPsPoll,u8 IsBTQosNull);s32 rtl8188eu_init_xmit_priv (struct adapter *padapter); -void rtl8188eu_free_xmit_priv (struct adapter *padapter);s32 rtl8188eu_hal_xmit (struct adapter *padapter,struct xmit_frame *frame);s32 rtl8188eu_mgnt_xmit (struct adapter *padapter,struct xmit_frame *frame);s32 rtl8188eu_xmit_buf_handler (struct adapter *padapter);
Signature · 1 line
1.7.10.4
PATCH 8/42 staging: rtl8188eu: Remove function _rtw_memset()
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_efuse.c | 18 ++--- drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 10 +-- drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 16 ++-- drivers/staging/rtl8188eu/core/rtw_mlme.c | 22 +++--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 74 ++++++++--------- drivers/staging/rtl8188eu/core/rtw_mp.c | 17 ++-- drivers/staging/rtl8188eu/core/rtw_p2p.c | 46 +++++------ drivers/staging/rtl8188eu/core/rtw_recv.c | 2 +- drivers/staging/rtl8188eu/core/rtw_security.c | 28 +++---- drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 2 +- drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 6 +- drivers/staging/rtl8188eu/core/rtw_xmit.c | 6 +- drivers/staging/rtl8188eu/hal/hal_com.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 4 +- drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 4 +- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 4 +- drivers/staging/rtl8188eu/include/osdep_service.h | 1 - drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 88 ++++++++++----------- drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 8 +- drivers/staging/rtl8188eu/os_dep/osdep_service.c | 5 -- drivers/staging/rtl8188eu/os_dep/recv_linux.c | 4 +- drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 2 +- 27 files changed, 191 insertions(+), 198 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ap.c +6 -6
@@ -548,7 +548,7 @@ static void update_bmc_sta(struct adapter *padapter) psta->ieee8021x_blocked =0 ; -_rtw_memset ((void *)&psta->sta_stats,0 ,sizeof (struct stainfo_stats )); +memset ((void *)&psta->sta_stats,0 ,sizeof (struct stainfo_stats ));/* prepare for add_RATid */ supportRateNum =rtw_get_rateset_len ((u8 *)&pcur_network->SupportedRates);
@@ -671,7 +671,7 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)/* todo: init other variables */ -_rtw_memset ((void *)&psta->sta_stats,0 ,sizeof (struct stainfo_stats )); +memset ((void *)&psta->sta_stats,0 ,sizeof (struct stainfo_stats ));spin_lock_bh (&psta->lock); psta->state |= _FW_LINKED;
@@ -886,7 +886,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) pbss_network->IELength = len; -_rtw_memset (ie,0 ,MAX_IE_SZ ); +memset (ie,0 ,MAX_IE_SZ );memcpy (ie, pbuf, pbss_network->IELength);
@@ -908,7 +908,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)/* SSID */ p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, _SSID_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_));if (p && ie_len >0 ) { -_rtw_memset (&pbss_network->Ssid,0 ,sizeof (struct ndis_802_11_ssid )); +memset (&pbss_network->Ssid,0 ,sizeof (struct ndis_802_11_ssid ));memcpy (pbss_network->Ssid.Ssid, (p +2 ), ie_len); pbss_network->Ssid.SsidLength = ie_len; }
@@ -922,7 +922,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) pbss_network->Configuration.DSConfig = channel; -_rtw_memset (supportRate,0 ,NDIS_802_11_LENGTH_RATES_EX ); +memset (supportRate,0 ,NDIS_802_11_LENGTH_RATES_EX );/* get supported rates */ p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_));if (p !=NULL ) {
@@ -1934,7 +1934,7 @@ void stop_ap_mode(struct adapter *padapter) pmlmeext->bstart_bss = false;/* reset and init security priv , this can refine with rtw_reset_securitypriv */ -_rtw_memset ((unsigned char *)&padapter->securitypriv,0 ,sizeof (struct security_priv )); +memset ((unsigned char *)&padapter->securitypriv,0 ,sizeof (struct security_priv )); padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen; padapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled;
drivers/staging/rtl8188eu/core/rtw_cmd.c +1 -1
@@ -878,7 +878,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) goto exit; } -_rtw_memset (psecnetwork,0 , t_len); +memset (psecnetwork,0 , t_len);memcpy (psecnetwork, &pnetwork->network,get_wlan_bssid_ex_sz (&pnetwork->network));
drivers/staging/rtl8188eu/core/rtw_efuse.c +9 -9
@@ -304,7 +304,7 @@ static s32 iol_read_efuse(struct adapter *padapter, u8 txpktbuf_bndy, u16 offsetu16 size =512 ;usb_write8 (padapter,REG_TDECTRL +1 , txpktbuf_bndy); -_rtw_memset (physical_map,0xFF ,512 ); +memset (physical_map,0xFF ,512 );usb_write8 (padapter,REG_PKT_BUFF_ACCESS_CTRL ,TXPKT_BUF_SELECT ); status =iol_execute (padapter,CMD_READ_EFUSE_MAP );if (status == _SUCCESS)
@@ -395,7 +395,7 @@ u8 Efuse_WordEnableDataWrite(struct adapter *pAdapter, u16 efuse_addr, u8 word_eu8 badworden =0x0F ;u8 tmpdata[8 ]; -_rtw_memset ((void *)tmpdata,0xff ,PGPKT_DATA_SIZE ); +memset ((void *)tmpdata,0xff ,PGPKT_DATA_SIZE );if (!(word_en&BIT0 )) { tmpaddr = start_addr;
@@ -501,8 +501,8 @@ int Efuse_PgPacketRead(struct adapter *pAdapter, u8 offset, u8 *data)if (offset > max_section)return false; -_rtw_memset ((void *)data,0xff ,sizeof (u8)*PGPKT_DATA_SIZE ); -_rtw_memset ((void *)tmpdata,0xff ,sizeof (u8)*PGPKT_DATA_SIZE ); +memset ((void *)data,0xff ,sizeof (u8)*PGPKT_DATA_SIZE ); +memset ((void *)tmpdata,0xff ,sizeof (u8)*PGPKT_DATA_SIZE );/* <Roger_TODO> Efuse has been pre-programmed dummy 5Bytes at the end of Efuse by CP. */ /* Skip dummy parts to prevent unexpected data read from Efuse. */
@@ -573,7 +573,7 @@ static bool hal_EfuseFixHeaderProcess(struct adapter *pAdapter, u8 efuseType, stu16 efuse_addr = *pAddr;u32 PgWriteSuccess =0 ; -_rtw_memset ((void *)originaldata,0xff ,8 ); +memset ((void *)originaldata,0xff ,8 );if (Efuse_PgPacketRead (pAdapter, pFixPkt->offset, originaldata)) {/* check if data exist */
@@ -868,7 +868,7 @@ hal_EfusePgCheckAvailableAddr(static void hal_EfuseConstructPGPkt (u8 offset,u8 word_en,u8 *pData,struct pgpkt *pTargetPkt) { -_rtw_memset ((void *)pTargetPkt->data,0xFF ,sizeof (u8)*8 ); +memset ((void *)pTargetPkt->data,0xFF ,sizeof (u8)*8 ); pTargetPkt->offset = offset; pTargetPkt->word_en = word_en;efuse_WordEnableDataRead (word_en, pData, pTargetPkt->data);
@@ -1095,7 +1095,7 @@ u8 rtw_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) offset = (addr >>3 ); word_en =0xF ; -_rtw_memset (newdata,0xFF ,PGPKT_DATA_SIZE +1 ); +memset (newdata,0xFF ,PGPKT_DATA_SIZE +1 ); i = addr &0x7 ;/* index of one package */ idx =0 ;/* data index */
@@ -1151,7 +1151,7 @@ u8 rtw_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) offset++; i =0 ; word_en =0xF ; -_rtw_memset (newdata,0xFF ,PGPKT_DATA_SIZE ); +memset (newdata,0xFF ,PGPKT_DATA_SIZE ); }while (1 );Efuse_PowerSwitch (padapter, true, false);
@@ -1236,7 +1236,7 @@ void EFUSE_ShadowMapUpdate(EFUSE_GetEfuseDefinition (pAdapter, efuseType,TYPE_EFUSE_MAP_LEN , (void *)&mapLen);if (pEEPROM->bautoload_fail_flag) -_rtw_memset (pEEPROM->efuse_eeprom_data,0xFF , mapLen); +memset (pEEPROM->efuse_eeprom_data,0xFF , mapLen);else Efuse_ReadAllMap (pAdapter, efuseType, pEEPROM->efuse_eeprom_data); }
drivers/staging/rtl8188eu/core/rtw_ieee80211.c +5 -5
@@ -334,7 +334,7 @@ exit:void rtw_set_supported_rate (u8 *SupportedRates,uint mode) { -_rtw_memset (SupportedRates,0 ,NDIS_802_11_LENGTH_RATES_EX ); +memset (SupportedRates,0 ,NDIS_802_11_LENGTH_RATES_EX );switch (mode) {case WIRELESS_11B :
@@ -957,7 +957,7 @@ enum parse_res rtw_ieee802_11_parse_elems(u8 *start, uint len,u8 *pos = start;int unknown =0 ; -_rtw_memset (elems,0 ,sizeof (*elems)); +memset (elems,0 ,sizeof (*elems));while (left >=2 ) {u8 id, elen;
@@ -1333,9 +1333,9 @@ static uint rtw_p2p_attr_remove(u8 *ie, uint ielen_ori, u8 attr_id)u8 *next_attr = target_attr+target_attr_len;uint remain_len = ielen-(next_attr-ie); -_rtw_memset (target_attr,0 , target_attr_len); +memset (target_attr,0 , target_attr_len);memcpy (target_attr, next_attr, remain_len); -_rtw_memset (target_attr+remain_len,0 , target_attr_len); +memset (target_attr+remain_len,0 , target_attr_len); *(ie+1 ) -= target_attr_len; ielen -= target_attr_len; }else {
@@ -1359,7 +1359,7 @@ void rtw_wlan_bssid_ex_remove_p2p_attr(struct wlan_bssid_ex *bss_ex, u8 attr_id)uint remain_len = bss_ex->IELength-(next_ie_ori-bss_ex->IEs);memcpy (next_ie, next_ie_ori, remain_len); -_rtw_memset (next_ie+remain_len,0 , p2p_ielen_ori-p2p_ielen); +memset (next_ie+remain_len,0 , p2p_ielen_ori-p2p_ielen); bss_ex->IELength -= p2p_ielen_ori-p2p_ielen; } }
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c +8 -8
@@ -126,7 +126,7 @@ u8 rtw_do_join(struct adapter *padapter) pibss = padapter->registrypriv.dev_network.MacAddress; -_rtw_memset (&pdev_network->Ssid,0 ,sizeof (struct ndis_802_11_ssid )); +memset (&pdev_network->Ssid,0 ,sizeof (struct ndis_802_11_ssid ));memcpy (&pdev_network->Ssid, &pmlmepriv->assoc_ssid,sizeof (struct ndis_802_11_ssid ));rtw_update_registrypriv_dev_network (padapter);
@@ -605,7 +605,7 @@ u8 rtw_set_802_11_remove_wep(struct adapter *padapter, u32 keyindex)int res;struct security_priv *psecuritypriv = &(padapter->securitypriv);if (keyindex <4 ) { -_rtw_memset (&psecuritypriv->dot11DefKey[keyindex],0 ,16 ); +memset (&psecuritypriv->dot11DefKey[keyindex],0 ,16 ); res =rtw_set_key (padapter, psecuritypriv, keyindex,0 ); psecuritypriv->dot11DefKeylen[keyindex] =0 ;if (res == _FAIL)
@@ -869,9 +869,9 @@ u8 rtw_set_802_11_add_key(struct adapter *padapter, struct ndis_802_11_key *key) ret = _FAIL; goto exit; } -_rtw_memset (&padapter->securitypriv.dot118021XGrpKey[(u8)((key->KeyIndex) &0x03 )],0 ,16 ); -_rtw_memset (&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) &0x03 )],0 ,16 ); -_rtw_memset (&padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) &0x03 )],0 ,16 ); +memset (&padapter->securitypriv.dot118021XGrpKey[(u8)((key->KeyIndex) &0x03 )],0 ,16 ); +memset (&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) &0x03 )],0 ,16 ); +memset (&padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) &0x03 )],0 ,16 );if ((key->KeyIndex &0x10000000 )) {memcpy (&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) &0x03 )], key->KeyMaterial +16 ,8 );
@@ -931,7 +931,7 @@ u8 rtw_set_802_11_add_key(struct adapter *padapter, struct ndis_802_11_key *key) stainfo =rtw_get_stainfo (&padapter->stapriv, pbssid);if (stainfo !=NULL ) { -_rtw_memset (&stainfo->dot118021x_UncstKey,0 ,16 );/* clear keybuffer */ +memset (&stainfo->dot118021x_UncstKey,0 ,16 );/* clear keybuffer */ memcpy (&stainfo->dot118021x_UncstKey, key->KeyMaterial,16 );
@@ -988,7 +988,7 @@ u8 rtw_set_802_11_remove_key(struct adapter *padapter, struct ndis_802_11_removeif (bgroup) {/* clear group key by index */ -_rtw_memset (&padapter->securitypriv.dot118021XGrpKey[keyIndex],0 ,16 ); +memset (&padapter->securitypriv.dot118021XGrpKey[keyIndex],0 ,16 );/* \todo Send a H2C Command to Firmware for removing this Key in CAM Entry. */ }else {
@@ -996,7 +996,7 @@ u8 rtw_set_802_11_remove_key(struct adapter *padapter, struct ndis_802_11_remove stainfo =rtw_get_stainfo (&padapter->stapriv, pbssid);if (stainfo) {/* clear key by BSSID */ -_rtw_memset (&stainfo->dot118021x_UncstKey,0 ,16 ); +memset (&stainfo->dot118021x_UncstKey,0 ,16 );/* \todo Send a H2C Command to Firmware for disable this Key in CAM Entry. */ }else {
drivers/staging/rtl8188eu/core/rtw_mlme.c +11 -11
@@ -59,7 +59,7 @@ int _rtw_init_mlme_priv(struct adapter *padapter)set_scanned_network_val (pmlmepriv,0 ); -_rtw_memset (&pmlmepriv->assoc_ssid,0 ,sizeof (struct ndis_802_11_ssid )); +memset (&pmlmepriv->assoc_ssid,0 ,sizeof (struct ndis_802_11_ssid )); pbuf =vzalloc (MAX_BSS_CNT * (sizeof (struct wlan_network )));
@@ -754,7 +754,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("switching to adhoc master\n" )); -_rtw_memset (&pdev_network->Ssid,0 ,sizeof (struct ndis_802_11_ssid )); +memset (&pdev_network->Ssid,0 ,sizeof (struct ndis_802_11_ssid ));memcpy (&pdev_network->Ssid, &pmlmepriv->assoc_ssid,sizeof (struct ndis_802_11_ssid ));rtw_update_registrypriv_dev_network (adapter);
@@ -1000,11 +1000,11 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str padapter->securitypriv.bgrpkey_handshake = false; psta->ieee8021x_blocked = true; psta->dot118021XPrivacy = padapter->securitypriv.dot11PrivacyAlgrthm; -_rtw_memset ((u8 *)&psta->dot118021x_UncstKey,0 ,sizeof (union Keytype )); -_rtw_memset ((u8 *)&psta->dot11tkiprxmickey,0 ,sizeof (union Keytype )); -_rtw_memset ((u8 *)&psta->dot11tkiptxmickey,0 ,sizeof (union Keytype )); -_rtw_memset ((u8 *)&psta->dot11txpn,0 ,sizeof (union pn48 )); -_rtw_memset ((u8 *)&psta->dot11rxpn,0 ,sizeof (union pn48 )); +memset ((u8 *)&psta->dot118021x_UncstKey,0 ,sizeof (union Keytype )); +memset ((u8 *)&psta->dot11tkiprxmickey,0 ,sizeof (union Keytype )); +memset ((u8 *)&psta->dot11tkiptxmickey,0 ,sizeof (union Keytype )); +memset ((u8 *)&psta->dot11txpn,0 ,sizeof (union pn48 )); +memset ((u8 *)&psta->dot11rxpn,0 ,sizeof (union pn48 )); }/* * Commented by Albert 2012/07/21
@@ -1419,7 +1419,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)memcpy (pdev_network, &tgt_network->network,get_wlan_bssid_ex_sz (&tgt_network->network)); -_rtw_memset (&pdev_network->Ssid,0 ,sizeof (struct ndis_802_11_ssid )); +memset (&pdev_network->Ssid,0 ,sizeof (struct ndis_802_11_ssid ));memcpy (&pdev_network->Ssid, &pmlmepriv->assoc_ssid,sizeof (struct ndis_802_11_ssid ));rtw_update_registrypriv_dev_network (adapter);
@@ -1681,7 +1681,7 @@ int rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv) res = _FAIL; goto exit; } -_rtw_memset (psetauthparm,0 ,sizeof (struct setauth_parm )); +memset (psetauthparm,0 ,sizeof (struct setauth_parm )); psetauthparm->mode = (unsigned char )psecuritypriv->dot11AuthAlgrthm; pcmd->cmdcode = _SetAuth_CMD_; pcmd->parmbuf = (unsigned char *)psetauthparm;
@@ -1716,7 +1716,7 @@ int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, in goto err_free_cmd; } -_rtw_memset (psetkeyparm,0 ,sizeof (struct setkey_parm )); +memset (psetkeyparm,0 ,sizeof (struct setkey_parm ));if (psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) { psetkeyparm->algorithm = (unsigned char )psecuritypriv->dot118021XGrpPrivacy;
@@ -2050,7 +2050,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ out_len = *pout_len; -_rtw_memset (&ht_capie,0 ,sizeof (struct rtw_ieee80211_ht_cap )); +memset (&ht_capie,0 ,sizeof (struct rtw_ieee80211_ht_cap )); ht_capie.cap_info =IEEE80211_HT_CAP_SUP_WIDTH | IEEE80211_HT_CAP_SGI_20 |
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +37 -37
296 lines not on this page · raw message
drivers/staging/rtl8188eu/core/rtw_mp.c +8 -9
@@ -97,7 +97,7 @@ static void _init_mp_priv_(struct mp_priv *pmp_priv) {struct wlan_bssid_ex *pnetwork; -_rtw_memset (pmp_priv,0 ,sizeof (struct mp_priv )); +memset (pmp_priv,0 ,sizeof (struct mp_priv )); pmp_priv->mode =MP_OFF ;
@@ -138,12 +138,12 @@ static void mp_init_xmit_attrib(struct mp_tx *pmptx, struct adapter *padapter)/* init xmitframe attribute */ pattrib = &pmptx->attrib; -_rtw_memset (pattrib,0 ,sizeof (struct pkt_attrib )); +memset (pattrib,0 ,sizeof (struct pkt_attrib )); desc = &pmptx->desc; -_rtw_memset (desc,0 ,TXDESC_SIZE ); +memset (desc,0 ,TXDESC_SIZE ); pattrib->ether_type =0x8712 ; -_rtw_memset (pattrib->dst,0xFF ,ETH_ALEN ); +memset (pattrib->dst,0xFF ,ETH_ALEN ); pattrib->ack_policy =0 ; pattrib->hdrlen =WLAN_HDR_A3_LEN ; pattrib->subtype =WIFI_DATA ;
@@ -362,7 +362,6 @@ s32 mp_start_test(struct adapter *padapter)mpt_ProStartTest (padapter);/* 3 1. initialize a new struct wlan_bssid_ex */ -/* _rtw_memset(&bssid, 0, sizeof(struct wlan_bssid_ex)); */ memcpy (bssid.MacAddress, pmppriv->network_macaddr,ETH_ALEN ); bssid.Ssid.SsidLength =strlen ("mp_pseudo_adhoc" );memcpy (bssid.Ssid.Ssid, (u8 *)"mp_pseudo_adhoc" , bssid.Ssid.SsidLength);
@@ -454,7 +453,7 @@ void mp_stop_test(struct adapter *padapter) pmlmepriv->fw_state = pmppriv->prev_fw_state;/* WIFI_STATION_STATE; */ /* flush the cur_network */ -_rtw_memset (tgt_network,0 ,sizeof (struct wlan_network )); +memset (tgt_network,0 ,sizeof (struct wlan_network ));_clr_fwstate_ (pmlmepriv,WIFI_MP_STATE );
@@ -697,7 +696,7 @@ void SetPacketTx(struct adapter *padapter) ptr = pmp_priv->tx.buf; desc = &(pmp_priv->tx.desc); -_rtw_memset (desc,0 ,TXDESC_SIZE ); +memset (desc,0 ,TXDESC_SIZE ); pkt_start = ptr; pkt_end = pkt_start + pkt_size;
@@ -770,7 +769,7 @@ void SetPacketTx(struct adapter *padapter)break ; } -_rtw_memset (ptr, payload, pkt_end - ptr); +memset (ptr, payload, pkt_end - ptr);/* 3 6. start thread */ pmp_priv->tx.PktTxThread =kthread_run (mp_xmit_packet_thread, pmp_priv,"RTW_MP_THREAD" );
@@ -905,7 +904,7 @@ u32 mp_query_psd(struct adapter *pAdapter, u8 *data)return 0 ; } -_rtw_memset (data,'\0' ,sizeof (*data)); +memset (data,'\0' ,sizeof (*data)); i = psd_start;while (i < psd_stop) {
drivers/staging/rtl8188eu/core/rtw_p2p.c +23 -23
137 lines not on this page · raw message
drivers/staging/rtl8188eu/core/rtw_recv.c +1 -1
@@ -46,7 +46,7 @@ void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS);void _rtw_init_sta_recv_priv (struct sta_recv_priv *psta_recvpriv) { -_rtw_memset ((u8 *)psta_recvpriv,0 ,sizeof (struct sta_recv_priv )); +memset ((u8 *)psta_recvpriv,0 ,sizeof (struct sta_recv_priv ));spin_lock_init (&psta_recvpriv->lock);
drivers/staging/rtl8188eu/core/rtw_security.c +14 -14
@@ -1081,13 +1081,13 @@ static int aes_cipher(u8 *key, uint hdrlen, u8 *pframe, uint plen) frsubtype = frsubtype>>4 ; -_rtw_memset ((void *)mic_iv,0 ,16 ); -_rtw_memset ((void *)mic_header1,0 ,16 ); -_rtw_memset ((void *)mic_header2,0 ,16 ); -_rtw_memset ((void *)ctr_preload,0 ,16 ); -_rtw_memset ((void *)chain_buffer,0 ,16 ); -_rtw_memset ((void *)aes_out,0 ,16 ); -_rtw_memset ((void *)padded_buffer,0 ,16 ); +memset ((void *)mic_iv,0 ,16 ); +memset ((void *)mic_header1,0 ,16 ); +memset ((void *)mic_header2,0 ,16 ); +memset ((void *)ctr_preload,0 ,16 ); +memset ((void *)chain_buffer,0 ,16 ); +memset ((void *)aes_out,0 ,16 ); +memset ((void *)padded_buffer,0 ,16 );if ((hdrlen ==WLAN_HDR_A3_LEN ) || (hdrlen ==WLAN_HDR_A3_QOS_LEN )) a4_exists =0 ;
@@ -1279,13 +1279,13 @@ static int aes_decipher(u8 *key, uint hdrlen,uint frsubtype =GetFrameSubType (pframe); frsubtype = frsubtype>>4 ; -_rtw_memset ((void *)mic_iv,0 ,16 ); -_rtw_memset ((void *)mic_header1,0 ,16 ); -_rtw_memset ((void *)mic_header2,0 ,16 ); -_rtw_memset ((void *)ctr_preload,0 ,16 ); -_rtw_memset ((void *)chain_buffer,0 ,16 ); -_rtw_memset ((void *)aes_out,0 ,16 ); -_rtw_memset ((void *)padded_buffer,0 ,16 ); +memset ((void *)mic_iv,0 ,16 ); +memset ((void *)mic_header1,0 ,16 ); +memset ((void *)mic_header2,0 ,16 ); +memset ((void *)ctr_preload,0 ,16 ); +memset ((void *)chain_buffer,0 ,16 ); +memset ((void *)aes_out,0 ,16 ); +memset ((void *)padded_buffer,0 ,16 );/* start to decrypt the payload */
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c +1 -1
@@ -29,7 +29,7 @@static void _rtw_init_stainfo (struct sta_info *psta) { -_rtw_memset ((u8 *)psta,0 ,sizeof (struct sta_info )); +memset ((u8 *)psta,0 ,sizeof (struct sta_info ));spin_lock_init (&psta->lock);_rtw_init_listhead (&psta->list);
drivers/staging/rtl8188eu/core/rtw_wlan_util.c +3 -3
@@ -239,7 +239,7 @@ void get_rate_set(struct adapter *padapter, unsigned char *pbssrate, int *bssrat {unsigned char supportedrates[NumRates]; -_rtw_memset (supportedrates,0 , NumRates); +memset (supportedrates,0 , NumRates); *bssrate_len =ratetbl2rateset (padapter, supportedrates);memcpy (pbssrate, supportedrates, *bssrate_len); }
@@ -541,7 +541,7 @@ void flush_all_cam_entry(struct adapter *padapter)rtw_hal_set_hwreg (padapter,HW_VAR_CAM_INVALID_ALL ,NULL ); -_rtw_memset ((u8 *)(pmlmeinfo->FW_sta_info),0 ,sizeof (pmlmeinfo->FW_sta_info)); +memset ((u8 *)(pmlmeinfo->FW_sta_info),0 ,sizeof (pmlmeinfo->FW_sta_info)); }int WMM_param_handler (struct adapter *padapter,struct ndis_802_11_var_ie *pIE)
@@ -1366,7 +1366,7 @@ void update_tx_basic_rate(struct adapter *padapter, u8 wirelessmode)if (!rtw_p2p_chk_state (pwdinfo,P2P_STATE_NONE ))return ;#endif /* CONFIG_88EU_P2P */ -_rtw_memset (supported_rates,0 ,NDIS_802_11_LENGTH_RATES_EX ); +memset (supported_rates,0 ,NDIS_802_11_LENGTH_RATES_EX );if ((wirelessmode &WIRELESS_11B ) && (wirelessmode ==WIRELESS_11B ))memcpy (supported_rates, rtw_basic_rate_cck,4 );
drivers/staging/rtl8188eu/core/rtw_xmit.c +3 -3
@@ -38,7 +38,7 @@ static void _init_txservq(struct tx_servq *ptxservq)void _rtw_init_sta_xmit_priv (struct sta_xmit_priv *psta_xmitpriv) { -_rtw_memset ((unsigned char *)psta_xmitpriv,0 ,sizeof (struct sta_xmit_priv )); +memset ((unsigned char *)psta_xmitpriv,0 ,sizeof (struct sta_xmit_priv ));spin_lock_init (&psta_xmitpriv->lock);_init_txservq (&psta_xmitpriv->be_q);_init_txservq (&psta_xmitpriv->bk_q);
@@ -800,7 +800,7 @@ s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pat } } -_rtw_memset (hdr,0 ,WLANHDR_OFFSET ); +memset (hdr,0 ,WLANHDR_OFFSET );SetFrameSubType (fctrl, pattrib->subtype);
@@ -1390,7 +1390,7 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)/* _queue *pf pxframe->buf_addr =NULL ; pxframe->pxmitbuf =NULL ; -_rtw_memset (&pxframe->attrib,0 ,sizeof (struct pkt_attrib )); +memset (&pxframe->attrib,0 ,sizeof (struct pkt_attrib ));/* pxframe->attrib.psta = NULL; */ pxframe->frame_tag =DATA_FRAMETAG ;
drivers/staging/rtl8188eu/hal/hal_com.c +1 -1
@@ -350,7 +350,7 @@ s32 c2h_evt_read(struct adapter *adapter, u8 *buf) c2h_evt = (struct c2h_evt_hdr *)buf; -_rtw_memset (c2h_evt,0 ,16 ); +memset (c2h_evt,0 ,16 ); *buf =usb_read8 (adapter,REG_C2HEVT_MSG_NORMAL ); *(buf+1 ) =usb_read8 (adapter,REG_C2HEVT_MSG_NORMAL +1 );
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c +2 -2
@@ -153,7 +153,7 @@ u8 rtl8188e_set_raid_cmd(struct adapter *adapt, u32 mask)if (haldata->fw_ractrl) {__le32 lmask; -_rtw_memset (buf,0 ,3 ); +memset (buf,0 ,3 ); lmask =cpu_to_le32 (mask);memcpy (buf, &lmask,3 );
@@ -700,7 +700,7 @@ void rtl8188e_set_p2p_ps_offload_cmd(struct adapter *adapt, u8 p2p_ps_state)switch (p2p_ps_state) {case P2P_PS_DISABLE :DBG_88E ("P2P_PS_DISABLE\n" ); -_rtw_memset (p2p_ps_offload,0 ,1 ); +memset (p2p_ps_offload,0 ,1 );break ;case P2P_PS_ENABLE :DBG_88E ("P2P_PS_ENABLE\n" );
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c +2 -2
@@ -53,7 +53,7 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter)u8 cut_ver, fab_ver;/* Init Value */ -_rtw_memset (dm_odm,0 ,sizeof (*dm_odm)); +memset (dm_odm,0 ,sizeof (*dm_odm)); dm_odm->Adapter = Adapter;
@@ -198,7 +198,7 @@ void rtl8188e_init_dm_priv(struct adapter *Adapter)struct dm_priv *pdmpriv = &hal_data->dmpriv;struct odm_dm_struct *podmpriv = &hal_data->odmpriv; -_rtw_memset (pdmpriv,0 ,sizeof (struct dm_priv )); +memset (pdmpriv,0 ,sizeof (struct dm_priv ));Init_ODM_ComInfo_88E (Adapter);ODM_InitDebugSetting (podmpriv); }
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +1 -1
@@ -741,7 +741,7 @@ static void Hal_ReadPowerValueFromPROM_8188E(struct txpowerinfo24g *pwrInfo24G, {u32 rfPath, eeAddr =EEPROM_TX_PWR_INX_88E , group, TxCount =0 ; -_rtw_memset (pwrInfo24G,0 ,sizeof (struct txpowerinfo24g )); +memset (pwrInfo24G,0 ,sizeof (struct txpowerinfo24g ));if (AutoLoadFail) {for (rfPath =0 ; rfPath <MAX_RF_PATH ; rfPath++) {
drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c +1 -1
@@ -86,7 +86,7 @@ void update_recvframe_attrib_88e(struct recv_frame *precvframe, report.rxdw5 = prxstat->rxdw5; pattrib = &precvframe->attrib; -_rtw_memset (pattrib,0 ,sizeof (struct rx_pkt_attrib )); +memset (pattrib,0 ,sizeof (struct rx_pkt_attrib )); pattrib->crc_err = (u8)((le32_to_cpu (report.rxdw0) >>14 ) &0x1 );/* u8)prxreport->crc32; */
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c +1 -1
@@ -47,7 +47,7 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter)RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("alloc recv_buf fail!\n" )); goto exit; } -_rtw_memset (precvpriv->pallocated_recv_buf,0 ,NR_RECVBUFF *sizeof (struct recv_buf ) +4 ); +memset (precvpriv->pallocated_recv_buf,0 ,NR_RECVBUFF *sizeof (struct recv_buf ) +4 ); precvpriv->precv_buf = (u8 *)N_BYTE_ALIGMENT ((size_t )(precvpriv->pallocated_recv_buf),4 );
drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c +2 -2
@@ -68,7 +68,7 @@ void rtl8188e_fill_fake_txdesc(struct adapter *adapt, u8 *desc, u32 BufferLen, u/* Clear all status */ ptxdesc = (struct tx_desc *)desc; -_rtw_memset (desc,0 ,TXDESC_SIZE ); +memset (desc,0 ,TXDESC_SIZE );/* offset 0 */ ptxdesc->txdw0 |=cpu_to_le32 (OWN |FSG |LSG );/* own, bFirstSeg, bLastSeg; */
@@ -192,7 +192,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, u8 bag } } -_rtw_memset (ptxdesc,0 ,sizeof (struct tx_desc )); +memset (ptxdesc,0 ,sizeof (struct tx_desc ));/* 4 offset 0 */ ptxdesc->txdw0 |=cpu_to_le32 (OWN |FSG |LSG );
drivers/staging/rtl8188eu/include/osdep_service.h +0 -1
@@ -199,7 +199,6 @@ void *rtw_malloc2d(int h, int w, int size);void rtw_mfree2d (void *pbuf,int h,int w,int size);void _rtw_memcpy (void *dec,void *sour,u32 sz); -void _rtw_memset (void *pbuf,int c,u32 sz);void _rtw_init_listhead (struct list_head *list);u32 rtw_is_list_empty (struct list_head *phead);
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +44 -44
295 lines not on this page · raw message
drivers/staging/rtl8188eu/os_dep/mlme_linux.c +4 -4
@@ -85,12 +85,12 @@ void rtw_reset_securitypriv(struct adapter *adapter)/* We have to backup the PMK information for WiFi PMK Caching test item. */ /* Backup the btkip_countermeasure information. */ /* When the countermeasure is trigger, the driver have to disconnect with AP for 60 seconds. */ -_rtw_memset (&backup_pmkid[0 ],0x00 ,sizeof (struct rt_pmkid_list ) *NUM_PMKID_CACHE ); +memset (&backup_pmkid[0 ],0x00 ,sizeof (struct rt_pmkid_list ) *NUM_PMKID_CACHE );memcpy (&backup_pmkid[0 ], &adapter->securitypriv.PMKIDList[0 ],sizeof (struct rt_pmkid_list ) *NUM_PMKID_CACHE ); backup_index = adapter->securitypriv.PMKIDIndex; backup_counter = adapter->securitypriv.btkip_countermeasure; backup_time = adapter->securitypriv.btkip_countermeasure_time; -_rtw_memset ((unsigned char *)&adapter->securitypriv,0 ,sizeof (struct security_priv )); +memset ((unsigned char *)&adapter->securitypriv,0 ,sizeof (struct security_priv ));/* Restore the PMK information to securitypriv structure for the following connection. */ memcpy(&adapter->securitypriv.PMKIDList[0],
@@ -137,7 +137,7 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie) buff =rtw_malloc (IW_CUSTOM_MAX );if (!buff)return ; -_rtw_memset (buff,0 ,IW_CUSTOM_MAX ); +memset (buff,0 ,IW_CUSTOM_MAX ); p = buff; p +=sprintf (p,"ASSOCINFO(ReqIEs =" ); len = sec_ie[1 ]+2 ;
@@ -145,7 +145,7 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie)for (i =0 ; i < len; i++) p +=sprintf (p,"%02x" , sec_ie[i]); p +=sprintf (p,")" ); -_rtw_memset (&wrqu,0 ,sizeof (wrqu)); +memset (&wrqu,0 ,sizeof (wrqu)); wrqu.data.length = p-buff; wrqu.data.length = (wrqu.data.length <IW_CUSTOM_MAX ) ? wrqu.data.length :IW_CUSTOM_MAX ;
drivers/staging/rtl8188eu/os_dep/osdep_service.c +0 -5
@@ -94,11 +94,6 @@ void rtw_mfree2d(void *pbuf, int h, int w, int size)kfree (pbuf); } -void _rtw_memset (void *pbuf,int c,u32 sz) -{ -memset (pbuf, c, sz); -} -void _rtw_init_listhead (struct list_head *list) {INIT_LIST_HEAD (list);
drivers/staging/rtl8188eu/os_dep/recv_linux.c +2 -2
@@ -73,7 +73,7 @@ void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup) } } -_rtw_memset (&ev,0x00 ,sizeof (ev)); +memset (&ev,0x00 ,sizeof (ev));if (bgroup) ev.flags |=IW_MICFAILURE_GROUP ;else
@@ -81,7 +81,7 @@ void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup) ev.src_addr.sa_family =ARPHRD_ETHER ;memcpy (ev.src_addr.sa_data, &pmlmepriv->assoc_bssid[0 ],ETH_ALEN ); -_rtw_memset (&wrqu,0x00 ,sizeof (wrqu)); +memset (&wrqu,0x00 ,sizeof (wrqu)); wrqu.data.length =sizeof (ev);wireless_send_event (padapter->pnetdev,IWEVMICHAELMICFAILURE , &wrqu, (char *)&ev);
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c +1 -1
@@ -261,7 +261,7 @@ static int usbctrl_vendorreq(struct adapter *adapt, u8 request, u16 value, u16 i }while (++vendorreq_times <=MAX_USBCTRL_VENDORREQ_TIMES ) { -_rtw_memset (pIo_buf,0 , len); +memset (pIo_buf,0 , len);if (requesttype ==0x01 ) { pipe =usb_rcvctrlpipe (udev,0 );/* read_in */
Signature · 1 line
1.7.10.4
PATCH 9/42 staging: rtl8188eu: Remove rtw_mfree2d(), wrapper for kfree()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_efuse.c | 2 +- drivers/staging/rtl8188eu/include/osdep_service.h | 1 - drivers/staging/rtl8188eu/os_dep/osdep_service.c | 5 ----- 3 files changed, 1 insertion(+), 7 deletions(-)
drivers/staging/rtl8188eu/core/rtw_efuse.c +1 -1
@@ -213,7 +213,7 @@ exit:kfree (efuseTbl);if (eFuseWord) -rtw_mfree2d ((void *)eFuseWord,EFUSE_MAX_SECTION_88E ,EFUSE_MAX_WORD_UNIT ,sizeof (u16)); +kfree (eFuseWord); } static void efuse_read_phymap_from_txpktbuf(
drivers/staging/rtl8188eu/include/osdep_service.h +0 -1
@@ -196,7 +196,6 @@ void _rtw_mfree(u8 *pbuf, u32 sz);#define rtw_mfree (pbuf, sz) _rtw_mfree((pbuf), (sz))void *rtw_malloc2d (int h,int w,int size); -void rtw_mfree2d (void *pbuf,int h,int w,int size);void _rtw_memcpy (void *dec,void *sour,u32 sz);
drivers/staging/rtl8188eu/os_dep/osdep_service.c +0 -5
@@ -89,11 +89,6 @@ void *rtw_malloc2d(int h, int w, int size)return a; } -void rtw_mfree2d (void *pbuf,int h,int w,int size) -{ -kfree (pbuf); -} -void _rtw_init_listhead (struct list_head *list) {INIT_LIST_HEAD (list);
Signature · 1 line
1.7.10.4
PATCH 10/42 staging: rtl8188eu: Remove unused function rtw_list_insert_head()
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
@@ -201,7 +201,6 @@ void _rtw_memcpy(void *dec, void *sour, u32 sz);void _rtw_init_listhead (struct list_head *list);u32 rtw_is_list_empty (struct list_head *phead); -void rtw_list_insert_head (struct list_head *plist,struct list_head *phead);void rtw_list_insert_tail (struct list_head *plist,struct list_head *phead);void rtw_list_delete (struct list_head *plist);
drivers/staging/rtl8188eu/os_dep/osdep_service.c +0 -5
@@ -107,11 +107,6 @@ u32 rtw_is_list_empty(struct list_head *phead)return false; } -void rtw_list_insert_head (struct list_head *plist,struct list_head *phead) -{ -list_add (plist, phead); -} -void rtw_list_insert_tail (struct list_head *plist,struct list_head *phead) {list_add_tail (plist, phead);
Signature · 1 line
1.7.10.4
PATCH 11/42 staging: rtl8188eu: Remove rtw_list_insert_tail(), wrapper for list_add_tail()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_ap.c | 2 +- drivers/staging/rtl8188eu/core/rtw_cmd.c | 4 ++-- drivers/staging/rtl8188eu/core/rtw_mlme.c | 12 ++++++------ drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/rtl8188eu/core/rtw_mp.c | 2 +- drivers/staging/rtl8188eu/core/rtw_recv.c | 12 ++++++------ drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 6 +++--- drivers/staging/rtl8188eu/core/rtw_xmit.c | 20 ++++++++++---------- drivers/staging/rtl8188eu/include/osdep_service.h | 1 - drivers/staging/rtl8188eu/os_dep/osdep_service.c | 5 ----- 10 files changed, 31 insertions(+), 37 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ap.c +1 -1
@@ -1176,7 +1176,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr) paclnode->valid = true; -rtw_list_insert_tail (&paclnode->list,get_list_head (pacl_node_q)); +list_add_tail (&paclnode->list,get_list_head (pacl_node_q)); pacl_list->num++;
drivers/staging/rtl8188eu/core/rtw_cmd.c +2 -2
@@ -138,7 +138,7 @@ int _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj)spin_lock_irqsave (&queue->lock, irqL); -rtw_list_insert_tail (&obj->list, &queue->queue); +list_add_tail (&obj->list, &queue->queue);spin_unlock_irqrestore (&queue->lock, irqL);
@@ -2124,7 +2124,7 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) } pwlan->last_scanned = jiffies; }else { -rtw_list_insert_tail (&(pwlan->list), &pmlmepriv->scanned_queue.queue); +list_add_tail (&(pwlan->list), &pmlmepriv->scanned_queue.queue); } pnetwork->Length =get_wlan_bssid_ex_sz (pnetwork);
drivers/staging/rtl8188eu/core/rtw_mlme.c +6 -6
@@ -74,7 +74,7 @@ int _rtw_init_mlme_priv(struct adapter *padapter)for (i =0 ; i <MAX_BSS_CNT ; i++) {_rtw_init_listhead (&(pnetwork->list)); -rtw_list_insert_tail (&(pnetwork->list), &(pmlmepriv->free_bss_pool.queue)); +list_add_tail (&(pnetwork->list), &(pmlmepriv->free_bss_pool.queue)); pnetwork++; }
@@ -135,7 +135,7 @@ int _rtw_enqueue_network(struct __queue *queue, struct wlan_network *pnetwork)spin_lock_bh (&queue->lock); -rtw_list_insert_tail (&pnetwork->list, &queue->queue); +list_add_tail (&pnetwork->list, &queue->queue);spin_unlock_bh (&queue->lock);
@@ -217,7 +217,7 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv , struct wlan_network *pnetwo }spin_lock_bh (&free_queue->lock);rtw_list_delete (&(pnetwork->list)); -rtw_list_insert_tail (&(pnetwork->list), &(free_queue->queue)); +list_add_tail (&(pnetwork->list), &(free_queue->queue)); pmlmepriv->num_of_scanned--;spin_unlock_bh (&free_queue->lock); }
@@ -231,7 +231,7 @@ void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *if (pnetwork->fixed)return ;rtw_list_delete (&(pnetwork->list)); -rtw_list_insert_tail (&(pnetwork->list),get_list_head (free_queue)); +list_add_tail (&(pnetwork->list),get_list_head (free_queue)); pmlmepriv->num_of_scanned--; }
@@ -575,7 +575,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t/* bss info not receiving from the right channel */ if (pnetwork->network.PhyInfo.SignalQuality ==101 ) pnetwork->network.PhyInfo.SignalQuality =0 ; -rtw_list_insert_tail (&(pnetwork->list), &(queue->queue)); +list_add_tail (&(pnetwork->list), &(queue->queue)); } }else {/* we have an entry and we are going to update it. But this entry may
@@ -830,7 +830,7 @@ static void free_scanqueue(struct mlme_priv *pmlmepriv)while (plist != phead) { ptemp = plist->next;rtw_list_delete (plist); -rtw_list_insert_tail (plist, &free_queue->queue); +list_add_tail (plist, &free_queue->queue); plist = ptemp; pmlmepriv->num_of_scanned--; }
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +2 -2
@@ -830,7 +830,7 @@ unsigned int OnAuth(struct adapter *padapter, struct recv_frame *precv_frame)spin_lock_bh (&pstapriv->auth_list_lock);if (rtw_is_list_empty (&pstat->auth_list)) { -rtw_list_insert_tail (&pstat->auth_list, &pstapriv->auth_list); +list_add_tail (&pstat->auth_list, &pstapriv->auth_list); pstapriv->auth_list_cnt++; }spin_unlock_bh (&pstapriv->auth_list_lock);
@@ -1416,7 +1416,7 @@ unsigned int OnAssocReq(struct adapter *padapter, struct recv_frame *precv_framespin_lock_bh (&pstapriv->asoc_list_lock);if (rtw_is_list_empty (&pstat->asoc_list)) { pstat->expire_to = pstapriv->expire_to; -rtw_list_insert_tail (&pstat->asoc_list, &pstapriv->asoc_list); +list_add_tail (&pstat->asoc_list, &pstapriv->asoc_list); pstapriv->asoc_list_cnt++; }spin_unlock_bh (&pstapriv->asoc_list_lock);
drivers/staging/rtl8188eu/core/rtw_mp.c +1 -1
@@ -983,7 +983,7 @@ void _rtw_mp_xmit_priv(struct xmit_priv *pxmitpriv) goto exit; } -rtw_list_insert_tail (&pxmitbuf->list, &(pxmitpriv->free_xmit_extbuf_queue.queue)); +list_add_tail (&pxmitbuf->list, &(pxmitpriv->free_xmit_extbuf_queue.queue)); pxmitbuf++; }
drivers/staging/rtl8188eu/core/rtw_recv.c +6 -6
@@ -84,7 +84,7 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)for (i =0 ; i <NR_RECVFRAME ; i++) {_rtw_init_listhead (&(precvframe->list)); -rtw_list_insert_tail (&(precvframe->list), +list_add_tail (&(precvframe->list), &(precvpriv->free_recv_queue.queue)); res =rtw_os_recv_resource_alloc (padapter, precvframe);
@@ -195,7 +195,7 @@ int rtw_free_recvframe(struct recv_frame *precvframe, precvframe->len =0 ; -rtw_list_insert_tail (&(precvframe->list),get_list_head (pfree_recv_queue)); +list_add_tail (&(precvframe->list),get_list_head (pfree_recv_queue));if (padapter !=NULL ) {if (pfree_recv_queue == &precvpriv->free_recv_queue)
@@ -215,7 +215,7 @@ int _rtw_enqueue_recvframe(struct recv_frame *precvframe, struct __queue *queue)rtw_list_delete (&(precvframe->list)); -rtw_list_insert_tail (&(precvframe->list),get_list_head (queue)); +list_add_tail (&(precvframe->list),get_list_head (queue));if (padapter !=NULL ) {if (queue == &precvpriv->free_recv_queue)
@@ -1572,7 +1572,7 @@ struct recv_frame *recvframe_chk_defrag(struct adapter *padapter,/* Then enqueue the 0~(n-1) fragment into the defrag_q */ phead =get_list_head (pdefrag_q); -rtw_list_insert_tail (&pfhdr->list, phead); +list_add_tail (&pfhdr->list, phead);RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("Enqueuq: ismfrag=%d, fragnum=%d\n" , ismfrag, fragnum));
@@ -1590,7 +1590,7 @@ struct recv_frame *recvframe_chk_defrag(struct adapter *padapter,/* enqueue the last fragment */ if (pdefrag_q !=NULL ) { phead =get_list_head (pdefrag_q); -rtw_list_insert_tail (&pfhdr->list, phead); +list_add_tail (&pfhdr->list, phead);/* call recvframe_defrag to defrag */ RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("defrag: ismfrag=%d, fragnum=%d\n" , ismfrag, fragnum));
@@ -1791,7 +1791,7 @@ static int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl,rtw_list_delete (&(prframe->list)); -rtw_list_insert_tail (&(prframe->list), plist); +list_add_tail (&(prframe->list), plist);return true; }
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c +3 -3
@@ -100,7 +100,7 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv)_rtw_init_listhead (&(pstapriv->sta_hash[i])); -rtw_list_insert_tail (&psta->list,get_list_head (&pstapriv->free_sta_queue)); +list_add_tail (&psta->list,get_list_head (&pstapriv->free_sta_queue)); psta++; }
@@ -243,7 +243,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)spin_lock_bh (&(pstapriv->sta_hash_lock)); -rtw_list_insert_tail (&psta->hash_list, phash_list); +list_add_tail (&psta->hash_list, phash_list); pstapriv->asoc_sta_count++;
@@ -413,7 +413,7 @@ u32 rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta)#endif /* CONFIG_88EU_AP_MODE */ spin_lock_bh (&(pfree_sta_queue->lock)); -rtw_list_insert_tail (&psta->list,get_list_head (pfree_sta_queue)); +list_add_tail (&psta->list,get_list_head (pfree_sta_queue));spin_unlock_bh (&pfree_sta_queue->lock); exit:
drivers/staging/rtl8188eu/core/rtw_xmit.c +10 -10
@@ -110,7 +110,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxframe->buf_addr =NULL ; pxframe->pxmitbuf =NULL ; -rtw_list_insert_tail (&(pxframe->list), &(pxmitpriv->free_xmit_queue.queue)); +list_add_tail (&(pxframe->list), &(pxmitpriv->free_xmit_queue.queue)); pxframe++; }
@@ -156,7 +156,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf->flags =XMIT_VO_QUEUE ; -rtw_list_insert_tail (&pxmitbuf->list, &(pxmitpriv->free_xmitbuf_queue.queue)); +list_add_tail (&pxmitbuf->list, &(pxmitpriv->free_xmitbuf_queue.queue)); pxmitbuf++; }
@@ -190,7 +190,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) goto exit; } -rtw_list_insert_tail (&pxmitbuf->list, &(pxmitpriv->free_xmit_extbuf_queue.queue)); +list_add_tail (&pxmitbuf->list, &(pxmitpriv->free_xmit_extbuf_queue.queue)); pxmitbuf++; }
@@ -1265,7 +1265,7 @@ s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)rtw_list_delete (&pxmitbuf->list); -rtw_list_insert_tail (&(pxmitbuf->list),get_list_head (pfree_queue)); +list_add_tail (&(pxmitbuf->list),get_list_head (pfree_queue)); pxmitpriv->free_xmit_extbuf_cnt++;spin_unlock_irqrestore (&pfree_queue->lock, irql);
@@ -1332,7 +1332,7 @@ s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)rtw_list_delete (&pxmitbuf->list); -rtw_list_insert_tail (&(pxmitbuf->list),get_list_head (pfree_xmitbuf_queue)); +list_add_tail (&(pxmitbuf->list),get_list_head (pfree_xmitbuf_queue)); pxmitpriv->free_xmitbuf_cnt++;spin_unlock_irqrestore (&pfree_xmitbuf_queue->lock, irql);
@@ -1429,7 +1429,7 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram pxmitframe->pkt =NULL ; } -rtw_list_insert_tail (&pxmitframe->list,get_list_head (pfree_xmit_queue)); +list_add_tail (&pxmitframe->list,get_list_head (pfree_xmit_queue)); pxmitpriv->free_xmitframe_cnt++;RT_TRACE (_module_rtl871x_xmit_c_, _drv_debug_, ("rtw_free_xmitframe():free_xmitframe_cnt=%d\n" , pxmitpriv->free_xmitframe_cnt));
@@ -1619,9 +1619,9 @@ s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe) ptxservq =rtw_get_sta_pending (padapter, psta, pattrib->priority, (u8 *)(&ac_index));if (rtw_is_list_empty (&ptxservq->tx_pending)) -rtw_list_insert_tail (&ptxservq->tx_pending,get_list_head (phwxmits[ac_index].sta_queue)); +list_add_tail (&ptxservq->tx_pending,get_list_head (phwxmits[ac_index].sta_queue)); -rtw_list_insert_tail (&pxmitframe->list,get_list_head (&ptxservq->sta_pending)); +list_add_tail (&pxmitframe->list,get_list_head (&ptxservq->sta_pending)); ptxservq->qcnt++; phwxmits[ac_index].accnt++; exit:
@@ -1802,7 +1802,7 @@ int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fraif (pstapriv->sta_dz_bitmap) {/* if any one sta is in ps mode */ rtw_list_delete (&pxmitframe->list); -rtw_list_insert_tail (&pxmitframe->list,get_list_head (&psta->sleep_q)); +list_add_tail (&pxmitframe->list,get_list_head (&psta->sleep_q)); psta->sleepq_len++;
@@ -1827,7 +1827,7 @@ int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fraif (pstapriv->sta_dz_bitmap&BIT (psta->aid)) {rtw_list_delete (&pxmitframe->list); -rtw_list_insert_tail (&pxmitframe->list,get_list_head (&psta->sleep_q)); +list_add_tail (&pxmitframe->list,get_list_head (&psta->sleep_q)); psta->sleepq_len++;
drivers/staging/rtl8188eu/include/osdep_service.h +0 -1
@@ -201,7 +201,6 @@ void _rtw_memcpy(void *dec, void *sour, u32 sz);void _rtw_init_listhead (struct list_head *list);u32 rtw_is_list_empty (struct list_head *phead); -void rtw_list_insert_tail (struct list_head *plist,struct list_head *phead);void rtw_list_delete (struct list_head *plist);u32 _rtw_down_sema (struct semaphore *sema);
drivers/staging/rtl8188eu/os_dep/osdep_service.c +0 -5
@@ -107,11 +107,6 @@ u32 rtw_is_list_empty(struct list_head *phead)return false; } -void rtw_list_insert_tail (struct list_head *plist,struct list_head *phead) -{ -list_add_tail (plist, phead); -} -/* Caller must check if the list is empty before calling rtw_list_delete */
Signature · 1 line
1.7.10.4
PATCH 12/42 staging: rtl8188eu: Remove function rtw_end_of_queue_search()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_ap.c | 16 ++--- drivers/staging/rtl8188eu/core/rtw_debug.c | 2 +- drivers/staging/rtl8188eu/core/rtw_mlme.c | 13 ++--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 7 +-- drivers/staging/rtl8188eu/core/rtw_p2p.c | 4 +- drivers/staging/rtl8188eu/core/rtw_recv.c | 8 +-- drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 10 ++-- drivers/staging/rtl8188eu/core/rtw_xmit.c | 14 ++--- drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 2 +- drivers/staging/rtl8188eu/include/osdep_service.h | 2 - drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 65 +++++---------------- drivers/staging/rtl8188eu/os_dep/osdep_service.c | 8 --- drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 2 +- 13 files changed, 49 insertions(+), 104 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ap.c +8 -8
@@ -288,7 +288,7 @@ void expire_timeout_chk(struct adapter *padapter) plist = phead->next;/* check auth_queue */ -while ((rtw_end_of_queue_search (phead, plist)) == false) { +while (phead != plist) { psta = container_of(plist, struct sta_info, auth_list); plist = plist->next;
@@ -322,7 +322,7 @@ void expire_timeout_chk(struct adapter *padapter) plist = phead->next;/* check asoc_queue */ -while ((rtw_end_of_queue_search (phead, plist)) == false) { +while (phead != plist) { psta = container_of(plist, struct sta_info, asoc_list); plist = plist->next;
@@ -1146,7 +1146,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr) phead =get_list_head (pacl_node_q); plist = phead->next; -while (!rtw_end_of_queue_search (phead, plist)) { +while (phead != plist) { paclnode = container_of(plist, struct rtw_wlan_acl_node, list); plist = plist->next;
@@ -1207,7 +1207,7 @@ int rtw_acl_remove_sta(struct adapter *padapter, u8 *addr) phead =get_list_head (pacl_node_q); plist = phead->next; -while (!rtw_end_of_queue_search (phead, plist)) { +while (phead != plist) { paclnode = container_of(plist, struct rtw_wlan_acl_node, list); plist = plist->next;
@@ -1505,7 +1505,7 @@ void associated_clients_update(struct adapter *padapter, u8 updated) plist = phead->next;/* check asoc_queue */ -while ((rtw_end_of_queue_search (phead, plist)) == false) { +while (phead != plist) { psta = container_of(plist, struct sta_info, asoc_list); plist = plist->next;
@@ -1779,7 +1779,7 @@ int rtw_ap_inform_ch_switch(struct adapter *padapter, u8 new_ch, u8 ch_offset) plist = phead->next;/* for each sta in asoc_queue */ -while (!rtw_end_of_queue_search (phead, plist)) { +while (phead != plist) { psta = container_of(plist, struct sta_info, asoc_list); plist = plist->next;
@@ -1813,7 +1813,7 @@ int rtw_sta_flush(struct adapter *padapter) plist = phead->next;/* free sta asoc_queue */ -while ((rtw_end_of_queue_search (phead, plist)) == false) { +while (phead != plist) { psta = container_of(plist, struct sta_info, asoc_list); plist = plist->next;
@@ -1942,7 +1942,7 @@ void stop_ap_mode(struct adapter *padapter)spin_lock_bh (&(pacl_node_q->lock)); phead =get_list_head (pacl_node_q); plist = phead->next; -while ((rtw_end_of_queue_search (phead, plist)) == false) { +while (phead != plist) { paclnode = container_of(plist, struct rtw_wlan_acl_node, list); plist = plist->next;
drivers/staging/rtl8188eu/core/rtw_debug.c +1 -1
@@ -853,7 +853,7 @@ int proc_get_all_sta_info(char *page, char **start, phead = &(pstapriv->sta_hash[i]); plist = phead->next; -while ((rtw_end_of_queue_search (phead, plist)) == false) { +while (phead != plist) { psta = container_of(plist, struct sta_info, hash_list); plist = plist->next;
drivers/staging/rtl8188eu/core/rtw_mlme.c +5 -8
@@ -278,7 +278,7 @@ void _rtw_free_network_queue(struct adapter *padapter, u8 isfreeall) phead =get_list_head (scanned_queue); plist = phead->next; -while (rtw_end_of_queue_search (phead, plist) == false) { +while (phead != plist) { pnetwork = container_of(plist, struct wlan_network, list); plist = plist->next;
@@ -438,7 +438,7 @@ struct wlan_network *rtw_get_oldest_wlan_network(struct __queue *scanned_queue) plist = phead->next;while (1 ) { -if (rtw_end_of_queue_search (phead, plist) == true) +if (phead == plist)break ; pwlan = container_of(plist, struct wlan_network, list);
@@ -522,10 +522,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t phead =get_list_head (queue); plist = phead->next; -while (1 ) { -if (rtw_end_of_queue_search (phead, plist) == true) -break ; - +while (phead != plist) { pnetwork = container_of(plist, struct wlan_network, list);if (is_same_network (&(pnetwork->network), target))
@@ -537,7 +534,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 (rtw_end_of_queue_search (phead, plist) == true) { +if (phead == plist) {if (_rtw_queue_empty (&(pmlmepriv->free_bss_pool)) == true) {/* If there are no more slots, expire the oldest */ pnetwork = oldest;
@@ -1615,7 +1612,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) phead =get_list_head (queue); adapter = (struct adapter *)pmlmepriv->nic_hdl; pmlmepriv->pscanned = phead->next; -while (!rtw_end_of_queue_search (phead, pmlmepriv->pscanned)) { +while (phead != pmlmepriv->pscanned) { pnetwork = container_of(pmlmepriv->pscanned, struct wlan_network, list);if (pnetwork ==NULL ) {RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("%s return _FAIL:(pnetwork==NULL)\n" , __func__));
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +2 -5
@@ -6237,14 +6237,11 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) phead =get_list_head (queue); plist = phead->next; -while (1 ) { +while (phead != plist) {int len;u8 *p;struct wlan_bssid_ex *pbss_network; -if (rtw_end_of_queue_search (phead, plist)) -break ; - pnetwork = container_of(plist, struct wlan_network, list); plist = plist->next;
@@ -8377,7 +8374,7 @@ u8 tx_beacon_hdl(struct adapter *padapter, unsigned char *pbuf) xmitframe_phead =get_list_head (&psta_bmc->sleep_q); xmitframe_plist = xmitframe_phead->next; -while (!rtw_end_of_queue_search (xmitframe_phead, xmitframe_plist)) { +while (xmitframe_phead != xmitframe_plist) { pxmitframe = container_of(xmitframe_plist, struct xmit_frame, list); xmitframe_plist = xmitframe_plist->next;
drivers/staging/rtl8188eu/core/rtw_p2p.c +2 -2
@@ -60,7 +60,7 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf) plist = phead->next;/* look up sta asoc_queue */ -while ((rtw_end_of_queue_search (phead, plist)) == false) { +while (phead != plist) { psta = container_of(plist, struct sta_info, asoc_list); plist = plist->next;
@@ -983,7 +983,7 @@ u32 process_p2p_devdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le plist = phead->next;/* look up sta asoc_queue */ -while ((rtw_end_of_queue_search (phead, plist)) == false) { +while (phead != plist) { psta = container_of(plist, struct sta_info, asoc_list); plist = plist->next;
drivers/staging/rtl8188eu/core/rtw_recv.c +4 -4
@@ -255,7 +255,7 @@ void rtw_free_recvframe_queue(struct __queue *pframequeue, struct __queue *pfre phead =get_list_head (pframequeue); plist = phead->next; -while (rtw_end_of_queue_search (phead, plist) == false) { +while (phead != plist) { hdr = container_of(plist, struct recv_frame, list); plist = plist->next;
@@ -1039,7 +1039,7 @@ static int validate_recv_ctrl_frame(struct adapter *padapter, xmitframe_phead =get_list_head (&psta->sleep_q); xmitframe_plist = xmitframe_phead->next; -if ((rtw_end_of_queue_search (xmitframe_phead, xmitframe_plist)) == false) { +if (xmitframe_phead != xmitframe_plist) { pxmitframe = container_of(xmitframe_plist, struct xmit_frame, list); xmitframe_plist = xmitframe_plist->next;
@@ -1471,7 +1471,7 @@ static struct recv_frame *recvframe_defrag(struct adapter *adapter, plist = plist->next; -while (rtw_end_of_queue_search (phead, plist) == false) { +while (phead != plist) { pnfhdr = container_of(plist, struct recv_frame, list); pnextrframe = (struct recv_frame *)pnfhdr;
@@ -1777,7 +1777,7 @@ static int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, phead =get_list_head (ppending_recvframe_queue); plist = phead->next; -while (rtw_end_of_queue_search (phead, plist) == false) { +while (phead != plist) { hdr = container_of(plist, struct recv_frame, list); pnextattrib = &hdr->attrib;
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c +5 -5
@@ -157,7 +157,7 @@ static void rtw_mfree_all_stainfo(struct sta_priv *pstapriv) phead =get_list_head (&pstapriv->free_sta_queue); plist = phead->next; -while ((rtw_end_of_queue_search (phead, plist)) == false) { +while (phead != plist) { psta = container_of(plist, struct sta_info , list); plist = plist->next; }
@@ -185,7 +185,7 @@ u32 _rtw_free_sta_priv(struct sta_priv *pstapriv) phead = &(pstapriv->sta_hash[index]); plist = phead->next; -while ((rtw_end_of_queue_search (phead, plist)) == false) { +while (phead != plist) {int i; psta = container_of(plist, struct sta_info , hash_list); plist = plist->next;
@@ -441,7 +441,7 @@ void rtw_free_all_stainfo(struct adapter *padapter) phead = &(pstapriv->sta_hash[index]); plist = phead->next; -while ((!rtw_end_of_queue_search (phead, plist))) { +while (phead != plist) { psta = container_of(plist, struct sta_info , hash_list); plist = plist->next;
@@ -478,7 +478,7 @@ struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) phead = &(pstapriv->sta_hash[index]); plist = phead->next; -while ((!rtw_end_of_queue_search (phead, plist))) { +while (phead != plist) { psta = container_of(plist, struct sta_info, hash_list);if ((!memcmp (psta->hwaddr, addr,ETH_ALEN )) == true) {
@@ -539,7 +539,7 @@ u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr)spin_lock_bh (&(pacl_node_q->lock)); phead =get_list_head (pacl_node_q); plist = phead->next; -while ((!rtw_end_of_queue_search (phead, plist))) { +while (phead != plist) { paclnode = container_of(plist, struct rtw_wlan_acl_node, list); plist = plist->next;
drivers/staging/rtl8188eu/core/rtw_xmit.c +7 -7
@@ -1456,7 +1456,7 @@ void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pfram phead =get_list_head (pframequeue); plist = phead->next; -while (!rtw_end_of_queue_search (phead, plist)) { +while (phead != plist) { pxmitframe = container_of(plist, struct xmit_frame, list); plist = plist->next;
@@ -1487,7 +1487,7 @@ static struct xmit_frame *dequeue_one_xmitframe(struct xmit_priv *pxmitpriv, str xmitframe_phead =get_list_head (pframe_queue); xmitframe_plist = xmitframe_phead->next; -if (!rtw_end_of_queue_search (xmitframe_phead, xmitframe_plist)) { +if (xmitframe_phead != xmitframe_plist) { pxmitframe = container_of(xmitframe_plist, struct xmit_frame, list); xmitframe_plist = xmitframe_plist->next;
@@ -1528,7 +1528,7 @@ struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmi sta_phead =get_list_head (phwxmit->sta_queue); sta_plist = sta_phead->next; -while (!rtw_end_of_queue_search (sta_phead, sta_plist)) { +while (sta_phead != sta_plist) { ptxservq = container_of(sta_plist, struct tx_servq, tx_pending); pframe_queue = &ptxservq->sta_pending;
@@ -1884,7 +1884,7 @@ static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struc phead =get_list_head (pframequeue); plist = phead->next; -while (!rtw_end_of_queue_search (phead, plist)) { +while (phead != plist) { pxmitframe = container_of(plist, struct xmit_frame, list); plist = plist->next;
@@ -1951,7 +1951,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta) xmitframe_phead =get_list_head (&psta->sleep_q); xmitframe_plist = xmitframe_phead->next; -while (!rtw_end_of_queue_search (xmitframe_phead, xmitframe_plist)) { +while (xmitframe_phead != xmitframe_plist) { pxmitframe = container_of(xmitframe_plist, struct xmit_frame, list); xmitframe_plist = xmitframe_plist->next;
@@ -2032,7 +2032,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta) xmitframe_phead =get_list_head (&psta_bmc->sleep_q); xmitframe_plist = xmitframe_phead->next; -while (!rtw_end_of_queue_search (xmitframe_phead, xmitframe_plist)) { +while (xmitframe_phead != xmitframe_plist) { pxmitframe = container_of(xmitframe_plist, struct xmit_frame, list); xmitframe_plist = xmitframe_plist->next;
@@ -2079,7 +2079,7 @@ void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *pst xmitframe_phead =get_list_head (&psta->sleep_q); xmitframe_plist = xmitframe_phead->next; -while (!rtw_end_of_queue_search (xmitframe_phead, xmitframe_plist)) { +while (xmitframe_phead != xmitframe_plist) { pxmitframe = container_of(xmitframe_plist, struct xmit_frame, list); xmitframe_plist = xmitframe_plist->next;
drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c +1 -1
@@ -535,7 +535,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitp xmitframe_phead =get_list_head (&ptxservq->sta_pending); xmitframe_plist = xmitframe_phead->next; -while (!rtw_end_of_queue_search (xmitframe_phead, xmitframe_plist)) { +while (xmitframe_phead != xmitframe_plist) { pxmitframe = container_of(xmitframe_plist, struct xmit_frame, list); xmitframe_plist = xmitframe_plist->next;
drivers/staging/rtl8188eu/include/osdep_service.h +0 -2
@@ -207,8 +207,6 @@ u32 _rtw_down_sema(struct semaphore *sema);void _rtw_init_queue (struct __queue *pqueue);u32 _rtw_queue_empty (struct __queue *pqueue); -u32 rtw_end_of_queue_search (struct list_head *queue, -struct list_head *pelement);u32 rtw_systime_to_ms (u32 systime);u32 rtw_ms_to_systime (u32 ms);
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +13 -52
143 lines not on this page · raw message
drivers/staging/rtl8188eu/os_dep/osdep_service.c +0 -8
@@ -130,14 +130,6 @@ u32 _rtw_queue_empty(struct __queue *pqueue)return rtw_is_list_empty (&(pqueue->queue)); } -u32 rtw_end_of_queue_search (struct list_head *head,struct list_head *plist) -{ -if (head == plist) -return true; -else -return false; -} -inline u32 rtw_systime_to_ms (u32 systime) {return systime *1000 /HZ ;
drivers/staging/rtl8188eu/os_dep/xmit_linux.c +1 -1
@@ -185,7 +185,7 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb) plist = phead->next;/* free sta asoc_queue */ -while (!rtw_end_of_queue_search (phead, plist)) { +while (phead != plist) { psta = container_of(plist, struct sta_info, asoc_list); plist = plist->next;
Signature · 1 line
1.7.10.4
PATCH 13/42 staging: rtl8188eu: Remove rtw_is_list_empty(), wrapper for list_emty()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_cmd.c | 2 +- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 12 ++++++------ drivers/staging/rtl8188eu/core/rtw_recv.c | 4 ++-- drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 4 ++-- drivers/staging/rtl8188eu/core/rtw_xmit.c | 2 +- drivers/staging/rtl8188eu/include/osdep_service.h | 1 - drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 2 +- drivers/staging/rtl8188eu/os_dep/osdep_service.c | 19 +------------------ 8 files changed, 14 insertions(+), 32 deletions(-)
drivers/staging/rtl8188eu/core/rtw_cmd.c +1 -1
@@ -155,7 +155,7 @@ struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue)spin_lock_irqsave (&queue->lock, irqL); -if (rtw_is_list_empty (&(queue->queue))) { +if (list_empty (&(queue->queue))) { obj =NULL ; }else { obj = container_of((&queue->queue)->next, struct cmd_obj, list);
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +6 -6
@@ -817,7 +817,7 @@ unsigned int OnAuth(struct adapter *padapter, struct recv_frame *precv_frame) pstat->auth_seq =0 ; }else {spin_lock_bh (&pstapriv->asoc_list_lock); -if (!rtw_is_list_empty (&pstat->asoc_list)) { +if (!list_empty (&pstat->asoc_list)) {rtw_list_delete (&pstat->asoc_list); pstapriv->asoc_list_cnt--; }
@@ -829,7 +829,7 @@ unsigned int OnAuth(struct adapter *padapter, struct recv_frame *precv_frame) }spin_lock_bh (&pstapriv->auth_list_lock); -if (rtw_is_list_empty (&pstat->auth_list)) { +if (list_empty (&pstat->auth_list)) {list_add_tail (&pstat->auth_list, &pstapriv->auth_list); pstapriv->auth_list_cnt++; }
@@ -1407,14 +1407,14 @@ unsigned int OnAssocReq(struct adapter *padapter, struct recv_frame *precv_frame pstat->state |=WIFI_FW_ASSOC_SUCCESS ;spin_lock_bh (&pstapriv->auth_list_lock); -if (!rtw_is_list_empty (&pstat->auth_list)) { +if (!list_empty (&pstat->auth_list)) {rtw_list_delete (&pstat->auth_list); pstapriv->auth_list_cnt--; }spin_unlock_bh (&pstapriv->auth_list_lock);spin_lock_bh (&pstapriv->asoc_list_lock); -if (rtw_is_list_empty (&pstat->asoc_list)) { +if (list_empty (&pstat->asoc_list)) { pstat->expire_to = pstapriv->expire_to;list_add_tail (&pstat->asoc_list, &pstapriv->asoc_list); pstapriv->asoc_list_cnt++;
@@ -1600,7 +1600,7 @@ unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_frame)u8 updated =0 ;spin_lock_bh (&pstapriv->asoc_list_lock); -if (!rtw_is_list_empty (&psta->asoc_list)) { +if (!list_empty (&psta->asoc_list)) {rtw_list_delete (&psta->asoc_list); pstapriv->asoc_list_cnt--; updated =ap_free_sta (padapter, psta, false, reason);
@@ -1664,7 +1664,7 @@ unsigned int OnDisassoc(struct adapter *padapter, struct recv_frame *precv_frameu8 updated =0 ;spin_lock_bh (&pstapriv->asoc_list_lock); -if (!rtw_is_list_empty (&psta->asoc_list)) { +if (!list_empty (&psta->asoc_list)) {rtw_list_delete (&psta->asoc_list); pstapriv->asoc_list_cnt--; updated =ap_free_sta (padapter, psta, false, reason);
drivers/staging/rtl8188eu/core/rtw_recv.c +2 -2
@@ -1810,7 +1810,7 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor/* Handling some condition for forced indicate case. */ if (bforced) { -if (rtw_is_list_empty (phead)) +if (list_empty (phead))return true; prhdr = container_of(plist, struct recv_frame, list);
@@ -1820,7 +1820,7 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor/* Prepare indication list and indication. */ /* Check if there is any packet need indicate. */ -while (!rtw_is_list_empty (phead)) { +while (!list_empty (phead)) { prhdr = container_of(plist, struct recv_frame, list); prframe = (struct recv_frame *)prhdr; pattrib = &prframe->attrib;
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c +2 -2
@@ -362,7 +362,7 @@ u32 rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta) phead =get_list_head (ppending_recvframe_queue); plist = phead->next; -while (!rtw_is_list_empty (phead)) { +while (!list_empty (phead)) { prhdr = container_of(plist, struct recv_frame, list); prframe = (struct recv_frame *)prhdr;
@@ -382,7 +382,7 @@ u32 rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta)#ifdef CONFIG_88EU_AP_MODE spin_lock_bh (&pstapriv->auth_list_lock); -if (!rtw_is_list_empty (&psta->auth_list)) { +if (!list_empty (&psta->auth_list)) {rtw_list_delete (&psta->auth_list); pstapriv->auth_list_cnt--; }
drivers/staging/rtl8188eu/core/rtw_xmit.c +1 -1
@@ -1618,7 +1618,7 @@ s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe) ptxservq =rtw_get_sta_pending (padapter, psta, pattrib->priority, (u8 *)(&ac_index)); -if (rtw_is_list_empty (&ptxservq->tx_pending)) +if (list_empty (&ptxservq->tx_pending))list_add_tail (&ptxservq->tx_pending,get_list_head (phwxmits[ac_index].sta_queue));list_add_tail (&pxmitframe->list,get_list_head (&ptxservq->sta_pending));
drivers/staging/rtl8188eu/include/osdep_service.h +0 -1
@@ -200,7 +200,6 @@ void *rtw_malloc2d(int h, int w, int size);void _rtw_memcpy (void *dec,void *sour,u32 sz);void _rtw_init_listhead (struct list_head *list); -u32 rtw_is_list_empty (struct list_head *phead);void rtw_list_delete (struct list_head *plist);u32 _rtw_down_sema (struct semaphore *sema);
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +1 -1
@@ -5176,7 +5176,7 @@ static int rtw_del_sta(struct net_device *dev, struct ieee_param *param) psta =rtw_get_stainfo (pstapriv, param->sta_addr);if (psta) {spin_lock_bh (&pstapriv->asoc_list_lock); -if (!rtw_is_list_empty (&psta->asoc_list)) { +if (!list_empty (&psta->asoc_list)) {rtw_list_delete (&psta->asoc_list); pstapriv->asoc_list_cnt--; updated =ap_free_sta (padapter, psta, true,WLAN_REASON_DEAUTH_LEAVING );
drivers/staging/rtl8188eu/os_dep/osdep_service.c +1 -18
@@ -94,23 +94,6 @@ void _rtw_init_listhead(struct list_head *list)INIT_LIST_HEAD (list); } -/* -For the following list_xxx operations, -caller must guarantee the atomic context. -Otherwise, there will be racing condition. -*/ -u32 rtw_is_list_empty (struct list_head *phead) -{ -if (list_empty (phead)) -return true; -else -return false; -} - -/* -Caller must check if the list is empty before calling rtw_list_delete -*/ -u32 _rtw_down_sema (struct semaphore *sema) {if (down_interruptible (sema))
@@ -127,7 +110,7 @@ void _rtw_init_queue(struct __queue *pqueue)u32 _rtw_queue_empty (struct __queue *pqueue) { -return rtw_is_list_empty (&(pqueue->queue)); +return list_empty (&(pqueue->queue)); }inline u32 rtw_systime_to_ms (u32 systime)
Signature · 1 line
1.7.10.4
PATCH 14/42 staging: rtl8188eu: Remove _rtw_init_listhead(), wrapper for INIT_LIST_HEAD()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_ap.c | 6 +++--- drivers/staging/rtl8188eu/core/rtw_cmd.c | 12 ++++++------ drivers/staging/rtl8188eu/core/rtw_mlme.c | 6 +++--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 10 +++++----- drivers/staging/rtl8188eu/core/rtw_mp.c | 2 +- drivers/staging/rtl8188eu/core/rtw_recv.c | 4 ++-- drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 14 +++++++------- drivers/staging/rtl8188eu/core/rtw_xmit.c | 12 ++++++------ drivers/staging/rtl8188eu/include/osdep_service.h | 1 - drivers/staging/rtl8188eu/include/rtw_cmd.h | 2 +- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 2 +- drivers/staging/rtl8188eu/os_dep/osdep_service.c | 7 +------ drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 2 +- 13 files changed, 37 insertions(+), 43 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ap.c +3 -3
@@ -1170,7 +1170,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr) paclnode = &pacl_list->aclnode[i];if (!paclnode->valid) { -_rtw_init_listhead (&paclnode->list); +INIT_LIST_HEAD (&paclnode->list);memcpy (paclnode->addr, addr,ETH_ALEN );
@@ -1910,11 +1910,11 @@ void start_ap_mode(struct adapter *padapter) pmlmepriv->p2p_probe_resp_ie =NULL ;/* for ACL */ -_rtw_init_listhead (&(pacl_list->acl_node_q.queue)); +INIT_LIST_HEAD (&(pacl_list->acl_node_q.queue)); pacl_list->num =0 ; pacl_list->mode =0 ;for (i =0 ; i <NUM_ACL ; i++) { -_rtw_init_listhead (&pacl_list->aclnode[i].list); +INIT_LIST_HEAD (&pacl_list->aclnode[i].list); pacl_list->aclnode[i].valid = false; } }
drivers/staging/rtl8188eu/core/rtw_cmd.c +6 -6
@@ -651,7 +651,7 @@ u8 rtw_getbbreg_cmd(struct adapter *padapter, u8 offset, u8 *pval)return _FAIL; } -_rtw_init_listhead (&ph2c->list); +INIT_LIST_HEAD (&ph2c->list); ph2c->cmdcode =GEN_CMD_CODE (_GetBBReg); ph2c->parmbuf = (unsigned char *)prdbbparm; ph2c->cmdsz =sizeof (struct readBB_parm );
@@ -715,7 +715,7 @@ u8 rtw_getrfreg_cmd(struct adapter *padapter, u8 offset, u8 *pval) goto exit; } -_rtw_init_listhead (&ph2c->list); +INIT_LIST_HEAD (&ph2c->list); ph2c->cmdcode =GEN_CMD_CODE (_GetRFReg); ph2c->parmbuf = (unsigned char *)prdrfparm; ph2c->cmdsz =sizeof (struct readRF_parm );
@@ -774,7 +774,7 @@ u8 rtw_createbss_cmd(struct adapter *padapter) goto exit; } -_rtw_init_listhead (&pcmd->list); +INIT_LIST_HEAD (&pcmd->list); pcmd->cmdcode = _CreateBss_CMD_; pcmd->parmbuf = (unsigned char *)pdev_network; pcmd->cmdsz =get_wlan_bssid_ex_sz ((struct wlan_bssid_ex *)pdev_network);
@@ -801,7 +801,7 @@ u8 rtw_createbss_cmd_ex(struct adapter *padapter, unsigned char *pbss, unsigned goto exit; } -_rtw_init_listhead (&pcmd->list); +INIT_LIST_HEAD (&pcmd->list); pcmd->cmdcode =GEN_CMD_CODE (_CreateBss); pcmd->parmbuf = pbss; pcmd->cmdsz = sz;
@@ -944,7 +944,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 */ -_rtw_init_listhead (&pcmd->list); +INIT_LIST_HEAD (&pcmd->list); pcmd->cmdcode = _JoinBss_CMD_;/* GEN_CMD_CODE(_JoinBss) */ pcmd->parmbuf = (unsigned char *)psecnetwork; pcmd->rsp =NULL ;
@@ -1194,7 +1194,7 @@ u8 rtw_getrttbl_cmd(struct adapter *padapter, struct getratable_rsp *pval) goto exit; } -_rtw_init_listhead (&ph2c->list); +INIT_LIST_HEAD (&ph2c->list); ph2c->cmdcode =GEN_CMD_CODE (_GetRaTable); ph2c->parmbuf = (unsigned char *)pgetrttblparm; ph2c->cmdsz =sizeof (struct getratable_parm );
drivers/staging/rtl8188eu/core/rtw_mlme.c +3 -3
@@ -72,7 +72,7 @@ int _rtw_init_mlme_priv(struct adapter *padapter) pnetwork = (struct wlan_network *)pbuf;for (i =0 ; i <MAX_BSS_CNT ; i++) { -_rtw_init_listhead (&(pnetwork->list)); +INIT_LIST_HEAD (&(pnetwork->list));list_add_tail (&(pnetwork->list), &(pmlmepriv->free_bss_pool.queue));
@@ -1685,7 +1685,7 @@ int rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv) pcmd->cmdsz = (sizeof (struct setauth_parm )); pcmd->rsp =NULL ; pcmd->rspsz =0 ; -_rtw_init_listhead (&pcmd->list); +INIT_LIST_HEAD (&pcmd->list);RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("after enqueue set_auth_cmd, auth_mode=%x\n" , psecuritypriv->dot11AuthAlgrthm));
@@ -1766,7 +1766,7 @@ int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, in pcmd->cmdsz = (sizeof (struct setkey_parm )); pcmd->rsp =NULL ; pcmd->rspsz =0 ; -_rtw_init_listhead (&pcmd->list); +INIT_LIST_HEAD (&pcmd->list); res =rtw_enqueue_cmd (pcmdpriv, pcmd);return res;
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +5 -5
@@ -7066,7 +7066,7 @@ void report_survey_event(struct adapter *padapter,return ; } -_rtw_init_listhead (&pcmd_obj->list); +INIT_LIST_HEAD (&pcmd_obj->list); pcmd_obj->cmdcode =GEN_CMD_CODE (_Set_MLME_EVT); pcmd_obj->cmdsz = cmdsz;
@@ -7118,7 +7118,7 @@ void report_surveydone_event(struct adapter *padapter)return ; } -_rtw_init_listhead (&pcmd_obj->list); +INIT_LIST_HEAD (&pcmd_obj->list); pcmd_obj->cmdcode =GEN_CMD_CODE (_Set_MLME_EVT); pcmd_obj->cmdsz = cmdsz;
@@ -7164,7 +7164,7 @@ void report_join_res(struct adapter *padapter, int res)return ; } -_rtw_init_listhead (&pcmd_obj->list); +INIT_LIST_HEAD (&pcmd_obj->list); pcmd_obj->cmdcode =GEN_CMD_CODE (_Set_MLME_EVT); pcmd_obj->cmdsz = cmdsz;
@@ -7217,7 +7217,7 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsireturn ; } -_rtw_init_listhead (&pcmd_obj->list); +INIT_LIST_HEAD (&pcmd_obj->list); pcmd_obj->cmdcode =GEN_CMD_CODE (_Set_MLME_EVT); pcmd_obj->cmdsz = cmdsz;
@@ -7272,7 +7272,7 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, intreturn ; } -_rtw_init_listhead (&pcmd_obj->list); +INIT_LIST_HEAD (&pcmd_obj->list); pcmd_obj->cmdcode =GEN_CMD_CODE (_Set_MLME_EVT); pcmd_obj->cmdsz = cmdsz;
drivers/staging/rtl8188eu/core/rtw_mp.c +1 -1
@@ -971,7 +971,7 @@ void _rtw_mp_xmit_priv(struct xmit_priv *pxmitpriv) pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmit_extbuf;for (i =0 ; i < num_xmit_extbuf; i++) { -_rtw_init_listhead (&pxmitbuf->list); +INIT_LIST_HEAD (&pxmitbuf->list); pxmitbuf->priv_data =NULL ; pxmitbuf->padapter = padapter;
drivers/staging/rtl8188eu/core/rtw_recv.c +2 -2
@@ -82,7 +82,7 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter) precvframe = (struct recv_frame *)precvpriv->precv_frame_buf;for (i =0 ; i <NR_RECVFRAME ; i++) { -_rtw_init_listhead (&(precvframe->list)); +INIT_LIST_HEAD (&(precvframe->list));list_add_tail (&(precvframe->list), &(precvpriv->free_recv_queue.queue));
@@ -169,7 +169,7 @@ struct recv_frame *rtw_alloc_recvframe(struct __queue *pfree_recv_queue)void rtw_init_recvframe (struct recv_frame *precvframe,struct recv_priv *precvpriv) {/* Perry: This can be removed */ -_rtw_init_listhead (&precvframe->list); +INIT_LIST_HEAD (&precvframe->list); precvframe->len =0 ; }
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c +7 -7
@@ -32,8 +32,8 @@ static void _rtw_init_stainfo(struct sta_info *psta)memset ((u8 *)psta,0 ,sizeof (struct sta_info ));spin_lock_init (&psta->lock); -_rtw_init_listhead (&psta->list); -_rtw_init_listhead (&psta->hash_list); +INIT_LIST_HEAD (&psta->list); +INIT_LIST_HEAD (&psta->hash_list);_rtw_init_queue (&psta->sleep_q); psta->sleepq_len =0 ;
@@ -42,9 +42,9 @@ static void _rtw_init_stainfo(struct sta_info *psta)#ifdef CONFIG_88EU_AP_MODE -_rtw_init_listhead (&psta->asoc_list); +INIT_LIST_HEAD (&psta->asoc_list); -_rtw_init_listhead (&psta->auth_list); +INIT_LIST_HEAD (&psta->auth_list); psta->expire_to =0 ;
@@ -98,7 +98,7 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv)for (i =0 ; i <NUM_STA ; i++) {_rtw_init_stainfo (psta); -_rtw_init_listhead (&(pstapriv->sta_hash[i])); +INIT_LIST_HEAD (&(pstapriv->sta_hash[i]));list_add_tail (&psta->list,get_list_head (&pstapriv->free_sta_queue));
@@ -110,8 +110,8 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv) pstapriv->sta_dz_bitmap =0 ; pstapriv->tim_bitmap =0 ; -_rtw_init_listhead (&pstapriv->asoc_list); -_rtw_init_listhead (&pstapriv->auth_list); +INIT_LIST_HEAD (&pstapriv->asoc_list); +INIT_LIST_HEAD (&pstapriv->auth_list);spin_lock_init (&pstapriv->asoc_list_lock);spin_lock_init (&pstapriv->auth_list_lock); pstapriv->asoc_list_cnt =0 ;
drivers/staging/rtl8188eu/core/rtw_xmit.c +6 -6
@@ -31,7 +31,7 @@ static u8 RFC1042_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0x00 };static void _init_txservq (struct tx_servq *ptxservq) { -_rtw_init_listhead (&ptxservq->tx_pending); +INIT_LIST_HEAD (&ptxservq->tx_pending);_rtw_init_queue (&ptxservq->sta_pending); ptxservq->qcnt =0 ; }
@@ -44,8 +44,8 @@ void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_xmitpriv)_init_txservq (&psta_xmitpriv->bk_q);_init_txservq (&psta_xmitpriv->vi_q);_init_txservq (&psta_xmitpriv->vo_q); -_rtw_init_listhead (&psta_xmitpriv->legacy_dz); -_rtw_init_listhead (&psta_xmitpriv->apsd); +INIT_LIST_HEAD (&psta_xmitpriv->legacy_dz); +INIT_LIST_HEAD (&psta_xmitpriv->apsd); }
@@ -100,7 +100,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxframe = (struct xmit_frame *)pxmitpriv->pxmit_frame_buf;for (i =0 ; i <NR_XMITFRAME ; i++) { -_rtw_init_listhead (&(pxframe->list)); +INIT_LIST_HEAD (&(pxframe->list)); pxframe->padapter = padapter; pxframe->frame_tag =NULL_FRAMETAG ;
@@ -138,7 +138,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf;for (i =0 ; i <NR_XMITBUFF ; i++) { -_rtw_init_listhead (&pxmitbuf->list); +INIT_LIST_HEAD (&pxmitbuf->list); pxmitbuf->priv_data =NULL ; pxmitbuf->padapter = padapter;
@@ -178,7 +178,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmit_extbuf;for (i =0 ; i < num_xmit_extbuf; i++) { -_rtw_init_listhead (&pxmitbuf->list); +INIT_LIST_HEAD (&pxmitbuf->list); pxmitbuf->priv_data =NULL ; pxmitbuf->padapter = padapter;
drivers/staging/rtl8188eu/include/osdep_service.h +0 -1
@@ -199,7 +199,6 @@ void *rtw_malloc2d(int h, int w, int size);void _rtw_memcpy (void *dec,void *sour,u32 sz); -void _rtw_init_listhead (struct list_head *list);void rtw_list_delete (struct list_head *plist);u32 _rtw_down_sema (struct semaphore *sema);
drivers/staging/rtl8188eu/include/rtw_cmd.h +1 -1
@@ -77,7 +77,7 @@ struct evt_priv {#define init_h2fwcmd_w_parm_no_rsp (pcmd, pparm, code) \ do {\ - _rtw_init_listhead(&pcmd->list);\ + INIT_LIST_HEAD(&pcmd->list);\ pcmd->cmdcode = code;\ pcmd->parmbuf = (u8 *)(pparm);\ pcmd->cmdsz = sizeof(*pparm);\
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +1 -1
@@ -4801,7 +4801,7 @@ static int set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid) pcmd->rsp =NULL ; pcmd->rspsz =0 ; -_rtw_init_listhead (&pcmd->list); +INIT_LIST_HEAD (&pcmd->list); res =rtw_enqueue_cmd (pcmdpriv, pcmd);
drivers/staging/rtl8188eu/os_dep/osdep_service.c +1 -6
@@ -89,11 +89,6 @@ void *rtw_malloc2d(int h, int w, int size)return a; } -void _rtw_init_listhead (struct list_head *list) -{ -INIT_LIST_HEAD (list); -} -u32 _rtw_down_sema (struct semaphore *sema) {if (down_interruptible (sema))
@@ -104,7 +99,7 @@ u32 _rtw_down_sema(struct semaphore *sema)void _rtw_init_queue (struct __queue *pqueue) { -_rtw_init_listhead (&(pqueue->queue)); +INIT_LIST_HEAD (&(pqueue->queue));spin_lock_init (&(pqueue->lock)); }
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c +1 -1
@@ -76,7 +76,7 @@ static int recvbuf2recvframe(struct adapter *adapt, struct sk_buff *pskb) goto _exit_recvbuf2recvframe; } -_rtw_init_listhead (&precvframe->list); +INIT_LIST_HEAD (&precvframe->list); precvframe->len =0 ;update_recvframe_attrib_88e (precvframe, prxstat);
Signature · 1 line
1.7.10.4
PATCH 15/42 staging: rtl8188eu: Remove unused function rtw_sleep_schedulable()
In reply to navin patidar--- drivers/staging/rtl8188eu/include/osdep_service.h | 1 - drivers/staging/rtl8188eu/os_dep/osdep_service.c | 12 ------------ 2 files changed, 13 deletions(-)
drivers/staging/rtl8188eu/include/osdep_service.h +0 -1
@@ -211,7 +211,6 @@ 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); -void rtw_sleep_schedulable (int ms);u32 rtw_atoi (u8 *s);
drivers/staging/rtl8188eu/os_dep/osdep_service.c +0 -12
@@ -129,18 +129,6 @@ inline s32 rtw_get_time_interval_ms(u32 start, u32 end)return rtw_systime_to_ms (end-start); } -void rtw_sleep_schedulable (int ms) -{ -u32 delta; - - delta = (ms *HZ )/1000 ;/* ms) */ -if (delta ==0 ) - delta =1 ;/* 1 ms */ -set_current_state (TASK_INTERRUPTIBLE ); -if (schedule_timeout (delta) !=0 ) -return ; -} -#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 16/42 staging: rtl8188eu: Use kstrtoul() for string to long conversion
In reply to navin patidar--- drivers/staging/rtl8188eu/include/osdep_service.h | 3 --- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 24 +++++++++++++++------ drivers/staging/rtl8188eu/os_dep/osdep_service.c | 17 --------------- 3 files changed, 17 insertions(+), 27 deletions(-)
drivers/staging/rtl8188eu/include/osdep_service.h +0 -3
@@ -211,9 +211,6 @@ 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); - -u32 rtw_atoi (u8 *s); -static inline unsigned char _cancel_timer_ex (struct timer_list *ptimer) {return del_timer_sync (ptimer);
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +17 -7
@@ -6590,9 +6590,10 @@ static int rtw_mp_rate(struct net_device *dev,struct iw_request_info *info, struct iw_point *wrqu, char *extra) { - u32 rate = MPT_RATE_1M; + unsigned long rate = MPT_RATE_1M;char *input =kmalloc (wrqu->length,GFP_KERNEL );struct adapter *padapter =rtw_netdev_priv (dev); +int status;if (!input)return -ENOMEM ;
@@ -6600,8 +6601,12 @@ static int rtw_mp_rate(struct net_device *dev,kfree (input);return -EFAULT ; } - rate =rtw_atoi (input); -sprintf (extra,"Set data rate to %d" , rate); + + status =kstrtoul (input,0 , &rate); +if (status) +return status; + +sprintf (extra,"Set data rate to %lu" , rate);kfree (input);if (rate <=0x7f ) rate =wifirate2_ratetbl_inx ((u8 )rate);
@@ -6623,8 +6628,9 @@ static int rtw_mp_channel(struct net_device *dev, struct iw_point *wrqu, char *extra) { struct adapter *padapter = rtw_netdev_priv(dev); -char *input =kmalloc (wrqu->length,GFP_KERNEL ); -u32 channel =1 ; +char *input =kmalloc (wrqu->length,GFP_KERNEL ); +unsigned long channel =1 ; +int status;if (!input)return -ENOMEM ;
@@ -6632,8 +6638,12 @@ static int rtw_mp_channel(struct net_device *dev,kfree (input);return -EFAULT ; } - channel =rtw_atoi (input); -sprintf (extra,"Change channel %d to channel %d" , padapter->mppriv.channel, channel); + + status =kstrtoul (input,0 , &channel); +if (status) +return status; + +sprintf (extra,"Change channel %d to channel %lu" , padapter->mppriv.channel, channel); padapter->mppriv.channel = channel;Hal_SetChannel (padapter);
drivers/staging/rtl8188eu/os_dep/osdep_service.c +0 -17
@@ -39,23 +39,6 @@ inline int RTW_STATUS_CODE(int error_code)return _FAIL; } -u32 rtw_atoi (u8 *s) -{ -int num =0 , flag =0 ; -int i; -for (i =0 ; i <=strlen (s); i++) { -if (s[i] >='0' && s[i] <='9' ) - num = num *10 + s[i] -'0' ; -else if (s[0 ] =='-' && i ==0 ) - flag =1 ; -else -break ; - } -if (flag ==1 ) - num = num *-1 ; -return num; -} -u8 *_rtw_malloc (u32 sz) {u8 *pbuf =NULL ;
Signature · 1 line
1.7.10.4