staging: rtl8723bs: CamelCase cleanup series
cover staging: rtl8723bs: CamelCase cleanup series
This series fixes CamelCase and Hungarian notation warnings reported by checkpatch.pl for the rtl8723bs driver.
Jose A. Perez de Azpillaga (4):
staging: rtl8723bs: remove Hungarian notation from booleans
staging: rtl8723bs: rename hal_btcoex functions to snake_case
staging: rtl8723bs: fix CamelCase in power management logic
staging: rtl8723bs: fix CamelCase in security identifiers
drivers/staging/rtl8723bs/core/rtw_ap.c | 10 +- drivers/staging/rtl8723bs/core/rtw_btcoex.c | 4 +- drivers/staging/rtl8723bs/core/rtw_cmd.c | 18 +-- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 26 ++-- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 32 ++--- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 130 +++++++++--------- drivers/staging/rtl8723bs/core/rtw_recv.c | 20 +-- drivers/staging/rtl8723bs/core/rtw_security.c | 4 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 4 +- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 12 +- drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- drivers/staging/rtl8723bs/hal/odm.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 16 +-- drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 2 +- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 10 +- .../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 4 +- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 14 +- drivers/staging/rtl8723bs/hal/sdio_ops.c | 2 +- drivers/staging/rtl8723bs/include/drv_types.h | 14 +- .../staging/rtl8723bs/include/hal_btcoex.h | 12 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- .../staging/rtl8723bs/include/rtw_pwrctrl.h | 14 +- .../staging/rtl8723bs/include/rtw_security.h | 8 +- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 42 +++--- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 38 ++--- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 14 +- .../staging/rtl8723bs/os_dep/sdio_ops_linux.c | 32 ++--- 28 files changed, 245 insertions(+), 245 deletions(-)
--
2.53.0
PATCH 1/4 staging: rtl8723bs: remove Hungarian notation from booleans
Remove Hungarian notation to snake_case to improve readability.
--- drivers/staging/rtl8723bs/core/rtw_btcoex.c | 2 +- drivers/staging/rtl8723bs/core/rtw_cmd.c | 12 ++-- drivers/staging/rtl8723bs/core/rtw_mlme.c | 12 ++-- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 28 ++++---- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 68 +++++++++---------- drivers/staging/rtl8723bs/core/rtw_recv.c | 18 ++--- drivers/staging/rtl8723bs/core/rtw_security.c | 4 +- drivers/staging/rtl8723bs/hal/odm.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 12 ++-- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 10 +-- .../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 4 +- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 14 ++-- drivers/staging/rtl8723bs/hal/sdio_ops.c | 2 +- drivers/staging/rtl8723bs/include/drv_types.h | 14 ++-- .../staging/rtl8723bs/include/rtw_pwrctrl.h | 6 +- .../staging/rtl8723bs/include/rtw_security.h | 2 +- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 6 +- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 28 ++++---- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 12 ++-- .../staging/rtl8723bs/os_dep/sdio_ops_linux.c | 32 ++++----- 20 files changed, 144 insertions(+), 144 deletions(-)
drivers/staging/rtl8723bs/core/rtw_btcoex.c +1 -1
@@ -23,7 +23,7 @@ void rtw_btcoex_HaltNotify(struct adapter *padapter)if (!padapter->bup)return ; -if (padapter->bSurpriseRemoved) +if (padapter->surprise_removed)return ;hal_btcoex_HaltNotify (padapter);
drivers/staging/rtl8723bs/core/rtw_cmd.c +6 -6
@@ -397,11 +397,11 @@ int rtw_cmd_thread(void *context)break ; } -if (padapter->bDriverStopped || padapter->bSurpriseRemoved) { +if (padapter->driver_stopped || padapter->surprise_removed) {netdev_dbg (padapter->pnetdev,"%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n" , - __func__, padapter->bDriverStopped, - padapter->bSurpriseRemoved, __LINE__); + __func__, padapter->driver_stopped, + padapter->surprise_removed, __LINE__);break ; }
@@ -420,11 +420,11 @@ int rtw_cmd_thread(void *context)continue ; _next: -if (padapter->bDriverStopped || padapter->bSurpriseRemoved) { +if (padapter->driver_stopped || padapter->surprise_removed) {netdev_dbg (padapter->pnetdev,"%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n" , - __func__, padapter->bDriverStopped, - padapter->bSurpriseRemoved, __LINE__); + __func__, padapter->driver_stopped, + padapter->surprise_removed, __LINE__);break ; }
drivers/staging/rtl8723bs/core/rtw_mlme.c +6 -6
@@ -266,7 +266,7 @@ signed int rtw_if_up(struct adapter *padapter) {signed int res; -if (padapter->bDriverStopped || padapter->bSurpriseRemoved || +if (padapter->driver_stopped || padapter->surprise_removed || !check_fwstate (&padapter->mlmepriv, _FW_LINKED)) res = false;else
@@ -927,7 +927,7 @@ inline void rtw_indicate_scan_done(struct adapter *padapter, bool aborted) {rtw_cfg80211_indicate_scan_done (padapter, aborted); -if ((!adapter_to_pwrctl (padapter)->bInSuspend) && +if ((!adapter_to_pwrctl (padapter)->in_suspend) && (!check_fwstate (&padapter->mlmepriv,WIFI_ASOC_STATE |WIFI_UNDER_LINKING ))) {rtw_set_ips_deny (padapter,0 );
@@ -945,7 +945,7 @@ void rtw_scan_abort(struct adapter *adapter) pmlmeext->scan_abort = true;while (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY) &&jiffies_to_msecs (start) <=200 ) { -if (adapter->bDriverStopped || adapter->bSurpriseRemoved) +if (adapter->driver_stopped || adapter->surprise_removed)break ;msleep (20 );
@@ -988,7 +988,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str/* security related */ if (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) { - padapter->securitypriv.binstallGrpkey = false; + padapter->securitypriv.install_grpkey = false; padapter->securitypriv.busetkipkey = false; padapter->securitypriv.bgrpkey_handshake = false;
@@ -1534,7 +1534,7 @@ void _rtw_join_timeout_handler(struct timer_list *t) mlmepriv.assoc_timer);struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -if (adapter->bDriverStopped || adapter->bSurpriseRemoved) +if (adapter->driver_stopped || adapter->surprise_removed)return ;spin_lock_bh (&pmlmepriv->lock);
@@ -1634,7 +1634,7 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter)if (!adapter->hw_init_completed)return ; -if (adapter->bDriverStopped || adapter->bSurpriseRemoved) +if (adapter->driver_stopped || adapter->surprise_removed)return ;if (adapter->net_closed)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +14 -14
@@ -411,7 +411,7 @@ void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext)if (!padapter)return ; -if (padapter->bDriverStopped) { +if (padapter->driver_stopped) {timer_delete_sync (&pmlmeext->survey_timer);timer_delete_sync (&pmlmeext->link_timer);/* timer_delete_sync(&pmlmeext->ADDBA_timer); */
@@ -1983,8 +1983,8 @@ void update_mgntframe_attrib_addr(struct adapter *padapter, struct xmit_frame *pvoid dump_mgntframe (struct adapter *padapter,struct xmit_frame *pmgntframe) { -if (padapter->bSurpriseRemoved || - padapter->bDriverStopped) { +if (padapter->surprise_removed || + padapter->driver_stopped) {rtw_free_xmitbuf (&padapter->xmitpriv, pmgntframe->pxmitbuf);rtw_free_xmitframe (&padapter->xmitpriv, pmgntframe);return ;
@@ -2001,8 +2001,8 @@ s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntfrstruct xmit_buf *pxmitbuf = pmgntframe->pxmitbuf;struct submit_ctx sctx; -if (padapter->bSurpriseRemoved || - padapter->bDriverStopped) { +if (padapter->surprise_removed || + padapter->driver_stopped) {rtw_free_xmitbuf (&padapter->xmitpriv, pmgntframe->pxmitbuf);rtw_free_xmitframe (&padapter->xmitpriv, pmgntframe);return ret;
@@ -2030,8 +2030,8 @@ s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, struct xmit_frame *pmgu32 timeout_ms =500 ;/* 500ms */ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -if (padapter->bSurpriseRemoved || - padapter->bDriverStopped) { +if (padapter->surprise_removed || + padapter->driver_stopped) {rtw_free_xmitbuf (&padapter->xmitpriv, pmgntframe->pxmitbuf);rtw_free_xmitframe (&padapter->xmitpriv, pmgntframe);return -1 ;
@@ -2535,7 +2535,7 @@ int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid, i++; -if (padapter->bDriverStopped || padapter->bSurpriseRemoved) +if (padapter->driver_stopped || padapter->surprise_removed)break ;if (i < try_cnt && wait_ms >0 && ret == _FAIL)
@@ -3090,7 +3090,7 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int pow i++; -if (padapter->bDriverStopped || padapter->bSurpriseRemoved) +if (padapter->driver_stopped || padapter->surprise_removed)break ;if (i < try_cnt && wait_ms >0 && ret == _FAIL)
@@ -3223,7 +3223,7 @@ int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int i++; -if (padapter->bDriverStopped || padapter->bSurpriseRemoved) +if (padapter->driver_stopped || padapter->surprise_removed)break ;if (i < try_cnt && wait_ms >0 && ret == _FAIL)
@@ -3317,7 +3317,7 @@ int issue_deauth_ex(struct adapter *padapter, u8 *da, unsigned short reason, int i++; -if (padapter->bDriverStopped || padapter->bSurpriseRemoved) +if (padapter->driver_stopped || padapter->surprise_removed)break ;if (i < try_cnt && wait_ms >0 && ret == _FAIL)
@@ -3752,11 +3752,11 @@ unsigned int send_beacon(struct adapter *padapter)cond_resched ();rtw_hal_get_hwreg (padapter,HW_VAR_BCN_VALID , (u8 *)(&bxmitok)); poll++; - }while ((poll%10 ) !=0 && false == bxmitok && !padapter->bSurpriseRemoved && !padapter->bDriverStopped); + }while ((poll%10 ) !=0 && false == bxmitok && !padapter->surprise_removed && !padapter->driver_stopped); - }while (false == bxmitok && issue <100 && !padapter->bSurpriseRemoved && !padapter->bDriverStopped); + }while (false == bxmitok && issue <100 && !padapter->surprise_removed && !padapter->driver_stopped); -if (padapter->bSurpriseRemoved || padapter->bDriverStopped) +if (padapter->surprise_removed || padapter->driver_stopped)return _FAIL;if (!bxmitok)
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +34 -34
222 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_recv.c +9 -9
@@ -382,7 +382,7 @@ static signed int recvframe_chkmic(struct adapter *adapter, union recv_frame *p/* psecuritypriv->dot118021XGrpKeyid, pmlmeinfo->key_index, rxdata_key_idx); */ -if (psecuritypriv->binstallGrpkey == false) { +if (psecuritypriv->install_grpkey == false) { res = _FAIL; goto exit; }
@@ -1946,8 +1946,8 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor/* indicate this recv_frame */ if (!pattrib->amsdu) { -if ((padapter->bDriverStopped == false) && - (padapter->bSurpriseRemoved == false)) +if ((padapter->driver_stopped == false) && + (padapter->surprise_removed == false))rtw_recv_indicatepkt (padapter, prframe);/* indicate this recv_frame */ }else if (pattrib->amsdu ==1 ) {
@@ -1987,8 +1987,8 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *wlanhdr_to_ethhdr (prframe);if (pattrib->qos !=1 ) { -if ((padapter->bDriverStopped == false) && - (padapter->bSurpriseRemoved == false)) { +if ((padapter->driver_stopped == false) && + (padapter->surprise_removed == false)) {rtw_recv_indicatepkt (padapter, prframe);return _SUCCESS;
@@ -2070,7 +2070,7 @@ void rtw_reordering_ctrl_timeout_handler(struct timer_list *t)struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue; -if (padapter->bDriverStopped || padapter->bSurpriseRemoved) +if (padapter->driver_stopped || padapter->surprise_removed)return ;spin_lock_bh (&ppending_recvframe_queue->lock);
@@ -2095,8 +2095,8 @@ static int process_recv_indicatepkts(struct adapter *padapter, union recv_frameif (recv_indicatepkt_reorder (padapter, prframe) != _SUCCESS) {/* including perform A-MPDU Rx Ordering Buffer Control */ -if ((padapter->bDriverStopped == false) && - (padapter->bSurpriseRemoved == false)) { +if ((padapter->driver_stopped == false) && + (padapter->surprise_removed == false)) { retval = _FAIL;return retval; }
@@ -2106,7 +2106,7 @@ static int process_recv_indicatepkts(struct adapter *padapter, union recv_frameif (retval != _SUCCESS)return retval; -if ((padapter->bDriverStopped == false) && (padapter->bSurpriseRemoved == false)) { +if ((padapter->driver_stopped == false) && (padapter->surprise_removed == false)) {/* indicate this recv_frame */ rtw_recv_indicatepkt (padapter, prframe); }else {
drivers/staging/rtl8723bs/core/rtw_security.c +2 -2
@@ -525,7 +525,7 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)static u32 no_gkey_bc_cnt;static u32 no_gkey_mc_cnt; -if (!psecuritypriv->binstallGrpkey) { +if (!psecuritypriv->install_grpkey) { res = _FAIL;if (start ==0 )
@@ -1217,7 +1217,7 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)static u32 no_gkey_bc_cnt;static u32 no_gkey_mc_cnt; -if (!psecuritypriv->binstallGrpkey) { +if (!psecuritypriv->install_grpkey) { res = _FAIL;if (start ==0 )
drivers/staging/rtl8723bs/hal/odm.c +1 -1
@@ -257,7 +257,7 @@ static void odm_RefreshRateAdaptiveMaskCE(struct dm_odm_t *pDM_Odm)u8 i;struct adapter *padapter = pDM_Odm->Adapter; -if (padapter->bDriverStopped) +if (padapter->driver_stopped)return ;if (!pDM_Odm->bUseRAMask)
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +6 -6
@@ -64,7 +64,7 @@ s32 FillH2CCmd8723B(struct adapter *padapter, u8 ElementID, u32 CmdLen, u8 *pCmdif (CmdLen >RTL8723B_MAX_CMD_LEN ) goto exit; -if (padapter->bSurpriseRemoved) +if (padapter->surprise_removed) goto exit;/* pay attention to if race condition happened in H2C cmd setting. */
@@ -665,11 +665,11 @@ void rtl8723b_download_rsvd_page(struct adapter *padapter, u8 mstatus)/* check rsvd page download OK. */ rtw_hal_get_hwreg (padapter,HW_VAR_BCN_VALID , (u8 *)(&bcn_valid)); poll++; - }while (!bcn_valid && (poll%10 ) !=0 && !padapter->bSurpriseRemoved && !padapter->bDriverStopped); + }while (!bcn_valid && (poll%10 ) !=0 && !padapter->surprise_removed && !padapter->driver_stopped); - }while (!bcn_valid && DLBcnCount <=100 && !padapter->bSurpriseRemoved && !padapter->bDriverStopped); + }while (!bcn_valid && DLBcnCount <=100 && !padapter->surprise_removed && !padapter->driver_stopped); -if (padapter->bSurpriseRemoved || padapter->bDriverStopped) { +if (padapter->surprise_removed || padapter->driver_stopped) { }else {struct pwrctrl_priv *pwrctl =adapter_to_pwrctl (padapter); pwrctl->fw_psmode_iface_id = padapter->iface_id;
@@ -930,8 +930,8 @@ void rtl8723b_download_BTCoex_AP_mode_rsvd_page(struct adapter *padapter)/* check rsvd page download OK. */ rtw_hal_get_hwreg (padapter,HW_VAR_BCN_VALID , &bcn_valid); poll++; - }while (!bcn_valid && (poll%10 ) !=0 && !padapter->bSurpriseRemoved && !padapter->bDriverStopped); - }while (!bcn_valid && (DLBcnCount <=100 ) && !padapter->bSurpriseRemoved && !padapter->bDriverStopped); + }while (!bcn_valid && (poll%10 ) !=0 && !padapter->surprise_removed && !padapter->driver_stopped); + }while (!bcn_valid && (DLBcnCount <=100 ) && !padapter->surprise_removed && !padapter->driver_stopped);if (bcn_valid) {struct pwrctrl_priv *pwrctl =adapter_to_pwrctl (padapter);
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +5 -5
@@ -192,7 +192,7 @@ static s32 polling_fwdl_chksum(do { cnt++; value32 =rtw_read32 (adapter,REG_MCUFWDL ); -if (value32 & FWDL_ChkSum_rpt || adapter->bSurpriseRemoved || adapter->bDriverStopped) +if (value32 & FWDL_ChkSum_rpt || adapter->surprise_removed || adapter->driver_stopped)break ;yield (); }while (jiffies_to_msecs (jiffies-start) < timeout_ms || cnt < min_cnt);
@@ -233,7 +233,7 @@ static s32 _FWFreeToGo(struct adapter *adapter, u32 min_cnt, u32 timeout_ms)do { cnt++; value32 =rtw_read32 (adapter,REG_MCUFWDL ); -if (value32 &WINTINI_RDY || adapter->bSurpriseRemoved || adapter->bDriverStopped) +if (value32 &WINTINI_RDY || adapter->surprise_removed || adapter->driver_stopped)break ;yield (); }while (jiffies_to_msecs (jiffies - start) < timeout_ms || cnt < min_cnt);
@@ -389,8 +389,8 @@ s32 rtl8723b_FirmwareDownload(struct adapter *padapter, bool bUsedWoWLANFw)_FWDownloadEnable (padapter, true); fwdl_start_time = jiffies;while ( - !padapter->bDriverStopped && - !padapter->bSurpriseRemoved && + !padapter->driver_stopped && + !padapter->surprise_removed && (write_fw++ <3 ||jiffies_to_msecs (jiffies - fwdl_start_time) <500 ) ) {/* reset FWDL chksum */
@@ -2785,7 +2785,7 @@ void GetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val)u32 valRCR;if ( - padapter->bSurpriseRemoved || + padapter->surprise_removed || (adapter_to_pwrctl (padapter)->rf_pwrstate == rf_off) ) {/* If it is in HW/SW Radio OFF or IPS state, we do not check Fw LPS Leave, */
drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c +2 -2
@@ -670,7 +670,7 @@ static void phy_SwChnlAndSetBwMode8723B(struct adapter *Adapter) {struct hal_com_data *pHalData =GET_HAL_DATA (Adapter); -if (Adapter->bDriverStopped || Adapter->bSurpriseRemoved) +if (Adapter->driver_stopped || Adapter->surprise_removed)return ;if (pHalData->bSwChnl) {
@@ -738,7 +738,7 @@ static void PHY_HandleSwChnlAndSetBW8723B( }/* Switch workitem or set timer to do switch channel or setbandwidth operation */ -if ((!Adapter->bDriverStopped) && (!Adapter->bSurpriseRemoved)) { +if ((!Adapter->driver_stopped) && (!Adapter->surprise_removed)) {phy_SwChnlAndSetBwMode8723B (Adapter); }else {if (pHalData->bSwChnl) {
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +7 -7
@@ -15,8 +15,8 @@ static u8 rtw_sdio_wait_enough_TxOQT_space(struct adapter *padapter, u8 agg_num)while (pHalData->SdioTxOQTFreeSpace < agg_num) {if ( - (padapter->bSurpriseRemoved) || - (padapter->bDriverStopped) + (padapter->surprise_removed) || + (padapter->driver_stopped) )return false;
@@ -88,8 +88,8 @@ static s32 rtl8723_dequeue_writeport(struct adapter *padapter) }if ( - (padapter->bSurpriseRemoved) || - (padapter->bDriverStopped) + (padapter->surprise_removed) || + (padapter->driver_stopped) ) goto free_xmitbuf;
@@ -130,7 +130,7 @@ s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter)return _FAIL; } - ret = (padapter->bDriverStopped) || (padapter->bSurpriseRemoved); + ret = (padapter->driver_stopped) || (padapter->surprise_removed);if (ret)return _FAIL;
@@ -365,8 +365,8 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padapter) next:if ( - (padapter->bDriverStopped) || - (padapter->bSurpriseRemoved) + (padapter->driver_stopped) || + (padapter->surprise_removed) )return _FAIL;
drivers/staging/rtl8723bs/hal/sdio_ops.c +1 -1
@@ -945,7 +945,7 @@ void sd_int_hdl(struct adapter *adapter)struct hal_com_data *hal;if ( - (adapter->bDriverStopped) || (adapter->bSurpriseRemoved) + (adapter->driver_stopped) || (adapter->surprise_removed) )return ;
drivers/staging/rtl8723bs/include/drv_types.h +7 -7
@@ -297,8 +297,8 @@ struct adapter {void *HalData;u32 hal_data_sz; -s32 bDriverStopped; -s32 bSurpriseRemoved; +s32 driver_stopped; +s32 surprise_removed;s32 bCardDisableWOHSM;u32 IsrContent;
@@ -399,17 +399,17 @@ static inline void RTW_ENABLE_FUNC(struct adapter *padapter, int func_bit)#define RTW_IS_FUNC_DISABLED (padapter, func_bit) (atomic_read(&adapter_to_dvobj(padapter)->disable_func) & (func_bit))#define RTW_CANNOT_IO (padapter) \ - ((padapter)->bSurpriseRemoved || \ + ((padapter)->surprise_removed || \ RTW_IS_FUNC_DISABLED((padapter), DF_IO_BIT))#define RTW_CANNOT_RX (padapter) \ - ((padapter)->bDriverStopped || \ - (padapter)->bSurpriseRemoved || \ + ((padapter)->driver_stopped || \ + (padapter)->surprise_removed || \ RTW_IS_FUNC_DISABLED((padapter), DF_RX_BIT))#define RTW_CANNOT_TX (padapter) \ - ((padapter)->bDriverStopped || \ - (padapter)->bSurpriseRemoved || \ + ((padapter)->driver_stopped || \ + (padapter)->surprise_removed || \ RTW_IS_FUNC_DISABLED((padapter), DF_TX_BIT))static inline u8 *myid (struct eeprom_priv *peepriv)
drivers/staging/rtl8723bs/include/rtw_pwrctrl.h +3 -3
@@ -164,7 +164,7 @@ struct pwrctrl_priv {u8 ps_processing;/* temporarily used to mark whether in rtw_ps_processor */ u8 fw_psmode_iface_id; -u8 bLeisurePs; +u8 leisure_ps;u8 LpsIdleCount;u8 power_mgnt;u8 org_power_mgnt;
@@ -174,8 +174,8 @@ struct pwrctrl_priv {u8 pnp_bstop_trx; -u8 bInternalAutoSuspend; -u8 bInSuspend; +u8 internal_auto_suspend; +u8 in_suspend;u8 bAutoResume;u8 autopm_cnt;
drivers/staging/rtl8723bs/include/rtw_security.h +1 -1
@@ -126,7 +126,7 @@ struct security_priv {struct arc4_ctx xmit_arc4_ctx;struct arc4_ctx recv_arc4_ctx; -u8 binstallGrpkey; +u8 install_grpkey;u8 binstallBIPkey;u8 busetkipkey;/* _timer tkip_timer; */
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +3 -3
@@ -600,7 +600,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa psecuritypriv->dot118021XGrpKeyid = param->u.crypt.idx; - psecuritypriv->binstallGrpkey = true; + psecuritypriv->install_grpkey = true; psecuritypriv->dot11PrivacyAlgrthm = psecuritypriv->dot118021XGrpPrivacy;/* */
@@ -674,7 +674,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa psecuritypriv->dot118021XGrpKeyid = param->u.crypt.idx; - psecuritypriv->binstallGrpkey = true; + psecuritypriv->install_grpkey = true; psecuritypriv->dot11PrivacyAlgrthm = psecuritypriv->dot118021XGrpPrivacy;/* */
@@ -798,7 +798,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_parammemcpy (padapter->securitypriv.dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len >16 ?16 : param->u.crypt.key_len));memcpy (padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16 ]),8 );memcpy (padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24 ]),8 ); - padapter->securitypriv.binstallGrpkey = true; + padapter->securitypriv.install_grpkey = true; padapter->securitypriv.dot118021XGrpKeyid = param->u.crypt.idx;rtw_set_key (padapter, &padapter->securitypriv, param->u.crypt.idx,1 , true);
drivers/staging/rtl8723bs/os_dep/os_intfs.c +14 -14
@@ -530,7 +530,7 @@ static void rtw_init_default_value(struct adapter *padapter) pmlmepriv->htpriv.ampdu_enable = false;/* set to disabled */ /* security_priv */ - psecuritypriv->binstallGrpkey = _FAIL; + psecuritypriv->install_grpkey = _FAIL; psecuritypriv->sw_encrypt = pregistrypriv->software_encrypt; psecuritypriv->sw_decrypt = pregistrypriv->software_decrypt;
@@ -800,8 +800,8 @@ static int _netdev_open(struct net_device *pnetdev) }if (!padapter->bup) { - padapter->bDriverStopped = false; - padapter->bSurpriseRemoved = false; + padapter->driver_stopped = false; + padapter->surprise_removed = false; padapter->bCardDisableWOHSM = false; status =rtw_hal_init (padapter);
@@ -849,7 +849,7 @@ int netdev_open(struct net_device *pnetdev)struct adapter *padapter =rtw_netdev_priv (pnetdev);struct pwrctrl_priv *pwrctrlpriv =adapter_to_pwrctl (padapter); -if (pwrctrlpriv->bInSuspend) +if (pwrctrlpriv->in_suspend)return 0 ;if (mutex_lock_interruptible (&(adapter_to_dvobj (padapter)->hw_init_mutex)))
@@ -868,7 +868,7 @@ static int ips_netdrv_open(struct adapter *padapter) padapter->net_closed = false; - padapter->bDriverStopped = false; + padapter->driver_stopped = false; padapter->bCardDisableWOHSM = false;/* padapter->bup = true; */
@@ -905,7 +905,7 @@ void rtw_ips_pwr_down(struct adapter *padapter)void rtw_ips_dev_unload (struct adapter *padapter) { -if (!padapter->bSurpriseRemoved) +if (!padapter->surprise_removed)rtw_hal_deinit (padapter); }
@@ -932,7 +932,7 @@ static int netdev_close(struct net_device *pnetdev)struct adapter *padapter =rtw_netdev_priv (pnetdev);struct pwrctrl_priv *pwrctl =adapter_to_pwrctl (padapter); -if (pwrctl->bInternalAutoSuspend) { +if (pwrctl->internal_auto_suspend) {/* rtw_pwr_wakeup(padapter); */ if (pwrctl->rf_pwrstate == rf_off) pwrctl->ps_flag = true;
@@ -975,14 +975,14 @@ void rtw_dev_unload(struct adapter *padapter)u8 cnt =0 ;if (padapter->bup) { - padapter->bDriverStopped = true; + padapter->driver_stopped = true;if (padapter->xmitpriv.ack_tx)rtw_ack_tx_done (&padapter->xmitpriv,RTW_SCTX_DONE_DRV_STOP );if (padapter->intf_stop) padapter->intf_stop (padapter); -if (!pwrctl->bInternalAutoSuspend) +if (!pwrctl->internal_auto_suspend)rtw_stop_drv_threads (padapter);while (atomic_read (&pcmdpriv->cmdthd_running)) {
@@ -1005,13 +1005,13 @@ void rtw_dev_unload(struct adapter *padapter) "%s: driver not in IPS\n", __func__); } -if (!padapter->bSurpriseRemoved) { +if (!padapter->surprise_removed) {hal_btcoex_IpsNotify (padapter, pwrctl->ips_mode_req);/* amy modify 20120221 for power seq is different between driver open and ips */ rtw_hal_deinit (padapter); - padapter->bSurpriseRemoved = true; + padapter->surprise_removed = true; } padapter->bup = false;
@@ -1088,12 +1088,12 @@ void rtw_suspend_common(struct adapter *padapter)netdev_dbg (padapter->pnetdev," suspend start\n" ); - pwrpriv->bInSuspend = true; + pwrpriv->in_suspend = true;while (pwrpriv->bips_processing)msleep (1 ); -if ((!padapter->bup) || (padapter->bDriverStopped) || (padapter->bSurpriseRemoved)) +if ((!padapter->bup) || (padapter->driver_stopped) || (padapter->surprise_removed))return ;rtw_ps_deny (padapter,PS_DENY_SUSPEND );
@@ -1185,7 +1185,7 @@ int rtw_resume_common(struct adapter *padapter)hal_btcoex_SuspendNotify (padapter,0 );if (pwrpriv) - pwrpriv->bInSuspend = false; + pwrpriv->in_suspend = false;netdev_dbg (padapter->pnetdev,"%s:%d in %d ms\n" , __func__, ret,jiffies_to_msecs (jiffies - start_time));
drivers/staging/rtl8723bs/os_dep/sdio_intf.c +6 -6
@@ -236,7 +236,7 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_priv *dvobj, const struct padapter->dvobj = dvobj; dvobj->if1 = padapter; - padapter->bDriverStopped = true; + padapter->driver_stopped = true; dvobj->padapters = padapter; padapter->iface_id =0 ;
@@ -388,7 +388,7 @@ static void rtw_dev_remove(struct sdio_func *func)rtw_unregister_netdevs (dvobj); -if (!padapter->bSurpriseRemoved) { +if (!padapter->surprise_removed) {int err;/* test surprise remove */
@@ -396,7 +396,7 @@ static void rtw_dev_remove(struct sdio_func *func)sdio_readb (func,0 , &err);sdio_release_host (func);if (err == -ENOMEDIUM ) - padapter->bSurpriseRemoved = true; + padapter->surprise_removed = true; }rtw_ps_deny (padapter,PS_DENY_DRV_REMOVE );
@@ -420,10 +420,10 @@ static int rtw_sdio_suspend(struct device *dev)struct pwrctrl_priv *pwrpriv =dvobj_to_pwrctl (psdpriv);struct adapter *padapter = psdpriv->if1; -if (padapter->bDriverStopped) +if (padapter->driver_stopped)return 0 ; -if (pwrpriv->bInSuspend) +if (pwrpriv->in_suspend)return 0 ;rtw_suspend_common (padapter);
@@ -435,7 +435,7 @@ static int rtw_resume_process(struct adapter *padapter) {struct pwrctrl_priv *pwrpriv =adapter_to_pwrctl (padapter); -if (!pwrpriv->bInSuspend) +if (!pwrpriv->in_suspend)return -1 ;return rtw_resume_common (padapter);
drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c +16 -16
@@ -42,7 +42,7 @@ s32 _sd_cmd52_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata) psdiodev = pintfhdl->pintf_dev; psdio = &psdiodev->intf_data; -if (padapter->bSurpriseRemoved) +if (padapter->surprise_removed)return err; func = psdio->func;
@@ -74,7 +74,7 @@ s32 sd_cmd52_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata) psdiodev = pintfhdl->pintf_dev; psdio = &psdiodev->intf_data; -if (padapter->bSurpriseRemoved) +if (padapter->surprise_removed)return err; func = psdio->func;
@@ -106,7 +106,7 @@ s32 _sd_cmd52_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata) psdiodev = pintfhdl->pintf_dev; psdio = &psdiodev->intf_data; -if (padapter->bSurpriseRemoved) +if (padapter->surprise_removed)return err; func = psdio->func;
@@ -138,7 +138,7 @@ s32 sd_cmd52_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata) psdiodev = pintfhdl->pintf_dev; psdio = &psdiodev->intf_data; -if (padapter->bSurpriseRemoved) +if (padapter->surprise_removed)return err; func = psdio->func;
@@ -166,7 +166,7 @@ u8 sd_read8(struct intf_hdl *pintfhdl, u32 addr, s32 *err) psdiodev = pintfhdl->pintf_dev; psdio = &psdiodev->intf_data; -if (padapter->bSurpriseRemoved) +if (padapter->surprise_removed)return v; func = psdio->func;
@@ -193,7 +193,7 @@ u32 sd_read32(struct intf_hdl *pintfhdl, u32 addr, s32 *err) psdiodev = pintfhdl->pintf_dev; psdio = &psdiodev->intf_data; -if (padapter->bSurpriseRemoved) +if (padapter->surprise_removed)return v; func = psdio->func;
@@ -222,10 +222,10 @@ u32 sd_read32(struct intf_hdl *pintfhdl, u32 addr, s32 *err) }if ((-ESHUTDOWN == *err) || (-ENODEV == *err)) - padapter->bSurpriseRemoved = true; + padapter->surprise_removed = true;if (rtw_inc_and_chk_continual_io_error (psdiodev) == true) { - padapter->bSurpriseRemoved = true; + padapter->surprise_removed = true;break ; } }
@@ -245,7 +245,7 @@ void sd_write8(struct intf_hdl *pintfhdl, u32 addr, u8 v, s32 *err) psdiodev = pintfhdl->pintf_dev; psdio = &psdiodev->intf_data; -if (padapter->bSurpriseRemoved) +if (padapter->surprise_removed)return ; func = psdio->func;
@@ -270,7 +270,7 @@ void sd_write32(struct intf_hdl *pintfhdl, u32 addr, u32 v, s32 *err) psdiodev = pintfhdl->pintf_dev; psdio = &psdiodev->intf_data; -if (padapter->bSurpriseRemoved) +if (padapter->surprise_removed)return ; func = psdio->func;
@@ -298,10 +298,10 @@ void sd_write32(struct intf_hdl *pintfhdl, u32 addr, u32 v, s32 *err) }if ((-ESHUTDOWN == *err) || (-ENODEV == *err)) - padapter->bSurpriseRemoved = true; + padapter->surprise_removed = true;if (rtw_inc_and_chk_continual_io_error (psdiodev) == true) { - padapter->bSurpriseRemoved = true; + padapter->surprise_removed = true;break ; } }
@@ -336,7 +336,7 @@ s32 _sd_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata) psdiodev = pintfhdl->pintf_dev; psdio = &psdiodev->intf_data; -if (padapter->bSurpriseRemoved) +if (padapter->surprise_removed)return err; func = psdio->func;
@@ -386,7 +386,7 @@ s32 sd_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata) psdiodev = pintfhdl->pintf_dev; psdio = &psdiodev->intf_data; -if (padapter->bSurpriseRemoved) +if (padapter->surprise_removed)return err; func = psdio->func;
@@ -429,7 +429,7 @@ s32 _sd_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata) psdiodev = pintfhdl->pintf_dev; psdio = &psdiodev->intf_data; -if (padapter->bSurpriseRemoved) +if (padapter->surprise_removed)return err; func = psdio->func;
@@ -480,7 +480,7 @@ s32 sd_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata) psdiodev = pintfhdl->pintf_dev; psdio = &psdiodev->intf_data; -if (padapter->bSurpriseRemoved) +if (padapter->surprise_removed)return err; func = psdio->func;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerRe: [PATCH 1/4] staging: rtl8723bs: remove Hungarian notation from booleans
Quoted 3 lines · Jose A. Perez de Azpillaga
Remove Hungarian notation to
snake_caseto improve readability.Signed-off-by Jose A. Perez de Azpillaga <[email protected]>
Please only rename one variable at a time.
thanks,
greg k-h
PATCH 2/4 staging: rtl8723bs: rename hal_btcoex functions to snake_case
In reply to Jose A. Perez de AzpillagaRename hal_btcoex functions from CamelCase to snake_case to improve readability.
--- drivers/staging/rtl8723bs/core/rtw_btcoex.c | 2 +- drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 42 +++++++++---------- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 12 +++--- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 4 +- drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 2 +- .../staging/rtl8723bs/include/hal_btcoex.h | 12 +++--- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- 9 files changed, 40 insertions(+), 40 deletions(-)
drivers/staging/rtl8723bs/core/rtw_btcoex.c +1 -1
@@ -58,7 +58,7 @@ void rtw_btcoex_LPS_Enter(struct adapter *padapter) pwrpriv =adapter_to_pwrctl (padapter); pwrpriv->bpower_saving = true; - lps_val =hal_btcoex_LpsVal (padapter); + lps_val =hal_btcoex_lps_val (padapter);rtw_set_ps_mode (padapter,PS_MODE_MIN ,0 , lps_val,"BTCOEX" ); }
drivers/staging/rtl8723bs/core/rtw_cmd.c +1 -1
@@ -1398,7 +1398,7 @@ static void rtw_lps_change_dtim_hdl(struct adapter *padapter, u8 dtim)if (dtim <=0 || dtim >16 )return ; -if (hal_btcoex_IsBtControlLps (padapter)) +if (hal_btcoex_is_bt_control_lps (padapter))return ;mutex_lock (&pwrpriv->lock);
drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -1
@@ -1641,7 +1641,7 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter)return ;if ((adapter_to_pwrctl (adapter)->fw_current_in_ps_mode) - && !(hal_btcoex_IsBtControlLps (adapter)) + && !(hal_btcoex_is_bt_control_lps (adapter)) ) {bool should_enter_ps;
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +21 -21
128 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/hal_btcoex.c +6 -6
@@ -1165,7 +1165,7 @@ bool hal_btcoex_IsBtExist(struct adapter *padapter)return pHalData->bt_coexist.bBtExist; } -bool hal_btcoex_IsBtDisabled (struct adapter *padapter) +bool hal_btcoex_is_bt_disabled (struct adapter *padapter) {if (!hal_btcoex_IsBtExist (padapter))return true;
@@ -1206,12 +1206,12 @@ void hal_btcoex_InitHwConfig(struct adapter *padapter, u8 bWifiOnly)EXhalbtcoutsrc_InitCoexDm (&GLBtCoexist); } -void hal_btcoex_IpsNotify (struct adapter *padapter,u8 type) +void hal_btcoex_ips_notify (struct adapter *padapter,u8 type) {EXhalbtcoutsrc_IpsNotify (&GLBtCoexist, type); } -void hal_btcoex_LpsNotify (struct adapter *padapter,u8 type) +void hal_btcoex_lps_notify (struct adapter *padapter,u8 type) {EXhalbtcoutsrc_LpsNotify (&GLBtCoexist, type); }
@@ -1274,7 +1274,7 @@ s32 hal_btcoex_IsBTCoexCtrlAMPDUSize(struct adapter *padapter)return (s32 )GLBtCoexist.btInfo.bBtCtrlAggBufSize; } -bool hal_btcoex_IsBtControlLps (struct adapter *padapter) +bool hal_btcoex_is_bt_control_lps (struct adapter *padapter) {if (!hal_btcoex_IsBtExist (padapter))return false;
@@ -1288,7 +1288,7 @@ bool hal_btcoex_IsBtControlLps(struct adapter *padapter)return false; } -bool hal_btcoex_IsLpsOn (struct adapter *padapter) +bool hal_btcoex_is_lps_on (struct adapter *padapter) {if (!hal_btcoex_IsBtExist (padapter))return false;
@@ -1307,7 +1307,7 @@ u8 hal_btcoex_RpwmVal(struct adapter *padapter)return GLBtCoexist.btInfo.rpwmVal; } -u8 hal_btcoex_LpsVal (struct adapter *padapter) +u8 hal_btcoex_lps_val (struct adapter *padapter) {return GLBtCoexist.btInfo.lpsVal; }
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +2 -2
@@ -363,9 +363,9 @@ void rtl8723b_set_FwPwrMode_cmd(struct adapter *padapter, u8 psmode) }if (psmode >0 ) { -if (hal_btcoex_IsBtControlLps (padapter) == true) { +if (hal_btcoex_is_bt_control_lps (padapter) == true) { PowerState =hal_btcoex_RpwmVal (padapter); - byte5 =hal_btcoex_LpsVal (padapter); + byte5 =hal_btcoex_lps_val (padapter);if ((rlbm ==2 ) && (byte5 &BIT (4 ))) {/* Keep awake interval to 1 to prevent from */
drivers/staging/rtl8723bs/hal/rtl8723b_dm.c +1 -1
@@ -161,7 +161,7 @@ void rtl8723b_HalDmWatchDog(struct adapter *Adapter)/* ODM_CmnInfoUpdate(&pHalData->odmpriv , ODM_CMNINFO_RSSI_MIN, pdmpriv->MinUndecoratedPWDBForDM); */ - bBtDisabled =hal_btcoex_IsBtDisabled (Adapter); + bBtDisabled =hal_btcoex_is_bt_disabled (Adapter);ODM_CmnInfoUpdate (&pHalData->odmpriv,ODM_CMNINFO_BT_ENABLED , !bBtDisabled);
drivers/staging/rtl8723bs/include/hal_btcoex.h +6 -6
@@ -22,7 +22,7 @@ struct bt_coexist {void hal_btcoex_SetBTCoexist (struct adapter *padapter,u8 bBtExist);bool hal_btcoex_IsBtExist (struct adapter *padapter); -bool hal_btcoex_IsBtDisabled (struct adapter *); +bool hal_btcoex_is_bt_disabled (struct adapter *);void hal_btcoex_SetPgAntNum (struct adapter *padapter,u8 antNum);void hal_btcoex_SetSingleAntPath (struct adapter *padapter,u8 singleAntPath);
@@ -30,8 +30,8 @@ void hal_btcoex_Initialize(void *padapter);void hal_btcoex_PowerOnSetting (struct adapter *padapter);void hal_btcoex_InitHwConfig (struct adapter *padapter,u8 bWifiOnly); -void hal_btcoex_IpsNotify (struct adapter *padapter,u8 type); -void hal_btcoex_LpsNotify (struct adapter *padapter,u8 type); +void hal_btcoex_ips_notify (struct adapter *padapter,u8 type); +void hal_btcoex_lps_notify (struct adapter *padapter,u8 type);void hal_btcoex_ScanNotify (struct adapter *padapter,u8 type);void hal_btcoex_ConnectNotify (struct adapter *padapter,u8 action);void hal_btcoex_MediaStatusNotify (struct adapter *padapter,u8 mediaStatus);
@@ -44,10 +44,10 @@ void hal_btcoex_HaltNotify(struct adapter *padapter);void hal_btcoex_Handler (struct adapter *padapter);s32 hal_btcoex_IsBTCoexCtrlAMPDUSize (struct adapter *padapter); -bool hal_btcoex_IsBtControlLps (struct adapter *padapter); -bool hal_btcoex_IsLpsOn (struct adapter *padapter); +bool hal_btcoex_is_bt_control_lps (struct adapter *padapter); +bool hal_btcoex_is_lps_on (struct adapter *padapter);u8 hal_btcoex_RpwmVal (struct adapter *); -u8 hal_btcoex_LpsVal (struct adapter *); +u8 hal_btcoex_lps_val (struct adapter *);u32 hal_btcoex_GetRaMask (struct adapter *);void hal_btcoex_RecordPwrMode (struct adapter *padapter,u8 *pCmdBuf,u8 cmdLen);
drivers/staging/rtl8723bs/os_dep/os_intfs.c +1 -1
@@ -1006,7 +1006,7 @@ void rtw_dev_unload(struct adapter *padapter) }if (!padapter->surprise_removed) { -hal_btcoex_IpsNotify (padapter, pwrctl->ips_mode_req); +hal_btcoex_ips_notify (padapter, pwrctl->ips_mode_req);/* amy modify 20120221 for power seq is different between driver open and ips */ rtw_hal_deinit (padapter);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerRe: [PATCH 2/4] staging: rtl8723bs: rename hal_btcoex functions to snake_case
Quoted 5 lines · Jose A. Perez de Azpillaga
Rename
hal_btcoexfunctions from CamelCase tosnake_caseto improve readability.Signed-off-by Jose A. Perez de Azpillaga <[email protected]>---
Again, one function name at a time.
thanks,
greg k-h
PATCH 3/4 staging: rtl8723bs: fix CamelCase in power management logic
In reply to Jose A. Perez de AzpillagaClean up CamelCase variables and functions specifically related to LPS and general power management.
--- drivers/staging/rtl8723bs/core/rtw_cmd.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 18 +++++++++--------- .../staging/rtl8723bs/include/rtw_pwrctrl.h | 8 ++++---- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 4 ++-- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 6 +++--- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +2 -2
@@ -1288,7 +1288,7 @@ void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)case LPS_CTRL_CONNECT : mstatus =1 ;/* connect */ /* Reset LPS Setting */ - pwrpriv->LpsIdleCount =0 ; + pwrpriv->lps_idle_count =0 ;rtw_hal_set_hwreg (padapter,HW_VAR_H2C_FW_JOINBSSRPT , (u8 *)(&mstatus));rtw_btcoex_MediaStatusNotify (padapter, mstatus);break ;
@@ -1299,7 +1299,7 @@ void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)rtw_hal_set_hwreg (padapter,HW_VAR_H2C_FW_JOINBSSRPT , (u8 *)(&mstatus));break ;case LPS_CTRL_SPECIAL_PACKET : - pwrpriv->DelayLPSLastTimeStamp = jiffies; + pwrpriv->delay_lps_last_timestamp = jiffies;hal_btcoex_SpecialPacketNotify (padapter,PACKET_DHCP );LPS_Leave (padapter,"LPS_CTRL_SPECIAL_PACKET" );break ;
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +9 -9
@@ -308,7 +308,7 @@ static u8 PS_RDY_CHECK(struct adapter *padapter) curr_time = jiffies; - delta_time = curr_time - pwrpriv->DelayLPSLastTimeStamp; + delta_time = curr_time - pwrpriv->delay_lps_last_timestamp;if (delta_time <LPS_DELAY_TIME )return false;
@@ -448,14 +448,14 @@ void LPS_Enter(struct adapter *padapter, const char *msg)if (pwrpriv->leisure_ps) {/* Idle for a while if we connect to AP a while ago. */ -if (pwrpriv->LpsIdleCount >=2 ) {/* 4 Sec */ +if (pwrpriv->lps_idle_count >=2 ) {/* 4 Sec */ if (pwrpriv->pwr_mode ==PS_MODE_ACTIVE ) {scnprintf (buf,sizeof (buf),"WIFI-%s" , msg); pwrpriv->bpower_saving = true;rtw_set_ps_mode (padapter, pwrpriv->power_mgnt, padapter->registrypriv.smart_ps,0 , buf); } }else - pwrpriv->LpsIdleCount++; + pwrpriv->lps_idle_count++; } }
@@ -484,7 +484,7 @@ void LPS_Leave(struct adapter *padapter, const char *msg) pwrpriv->bpower_saving = false; } -void LeaveAllPowerSaveModeDirect (struct adapter *Adapter) +void leave_all_power_save_mode_direct (struct adapter *Adapter) {struct adapter *pri_padapter =GET_PRIMARY_ADAPTER (Adapter);struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv);
@@ -515,7 +515,7 @@ void LeaveAllPowerSaveModeDirect(struct adapter *Adapter)/* Description: Leave all power save mode: LPS, FwLPS, IPS if needed. */ /* Move code to function by tynli. 2010.03.26. */ /* */ -void LeaveAllPowerSaveMode (struct adapter *Adapter) +void leave_all_power_save_mode (struct adapter *Adapter) {struct dvobj_priv *dvobj =adapter_to_dvobj (Adapter);u8 enqueue =0 ;
@@ -953,7 +953,7 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter) pwrctrlpriv->in_suspend = false; pwrctrlpriv->bkeepfwalive = false; - pwrctrlpriv->LpsIdleCount =0 ; + pwrctrlpriv->lps_idle_count =0 ; pwrctrlpriv->power_mgnt = padapter->registrypriv.power_mgnt;/* PS_MODE_MIN; */ pwrctrlpriv->leisure_ps = pwrctrlpriv->power_mgnt !=PS_MODE_ACTIVE ;
@@ -1011,7 +1011,7 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *calunsigned long deny_time = jiffies +msecs_to_jiffies (ips_deffer_ms);/* for LPS */ -LeaveAllPowerSaveMode (padapter); +leave_all_power_save_mode (padapter);/* IPS still bound with primary adapter */ padapter =GET_PRIMARY_ADAPTER (padapter);
@@ -1079,9 +1079,9 @@ int rtw_pm_set_lps(struct adapter *padapter, u8 mode)if (mode <PS_MODE_NUM ) {if (pwrctrlpriv->power_mgnt != mode) {if (mode ==PS_MODE_ACTIVE ) -LeaveAllPowerSaveMode (padapter); +leave_all_power_save_mode (padapter);else - pwrctrlpriv->LpsIdleCount =2 ; + pwrctrlpriv->lps_idle_count =2 ; pwrctrlpriv->power_mgnt = mode; pwrctrlpriv->leisure_ps =
drivers/staging/rtl8723bs/include/rtw_pwrctrl.h +4 -4
@@ -165,11 +165,11 @@ struct pwrctrl_priv {u8 fw_psmode_iface_id;u8 leisure_ps; -u8 LpsIdleCount; +u8 lps_idle_count;u8 power_mgnt;u8 org_power_mgnt;bool fw_current_in_ps_mode; -unsigned long DelayLPSLastTimeStamp; +unsigned long delay_lps_last_timestamp;s32 pnp_current_pwr_state;u8 pnp_bstop_trx;
@@ -224,8 +224,8 @@ extern void rtw_unregister_cmd_alive(struct adapter *padapter);extern void cpwm_int_hdl (struct adapter *padapter,struct reportpwrstate_parm *preportpwrstate);extern void LPS_Leave_check (struct adapter *padapter); -extern void LeaveAllPowerSaveMode (struct adapter *Adapter); -extern void LeaveAllPowerSaveModeDirect (struct adapter *Adapter); +extern void leave_all_power_save_mode (struct adapter *Adapter); +extern void leave_all_power_save_mode_direct (struct adapter *Adapter);void _ips_enter (struct adapter *padapter);void ips_enter (struct adapter *padapter);int _ips_leave (struct adapter *padapter);
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +2 -2
@@ -1606,7 +1606,7 @@ static int cfg80211_rtw_leave_ibss(struct wiphy *wiphy, struct net_device *ndev)if (check_fwstate (&padapter->mlmepriv, _FW_LINKED)) {rtw_scan_abort (padapter); -LeaveAllPowerSaveMode (padapter); +leave_all_power_save_mode (padapter); rtw_wdev->iftype =NL80211_IFTYPE_STATION ;
@@ -1783,7 +1783,7 @@ static int cfg80211_rtw_disconnect(struct wiphy *wiphy, struct net_device *ndev,rtw_set_to_roam (padapter,0 );rtw_scan_abort (padapter); -LeaveAllPowerSaveMode (padapter); +leave_all_power_save_mode (padapter);rtw_disassoc_cmd (padapter,500 , false);rtw_indicate_disconnect (padapter);
drivers/staging/rtl8723bs/os_dep/os_intfs.c +3 -3
@@ -948,7 +948,7 @@ static int netdev_close(struct net_device *pnetdev) }/* s2. */ -LeaveAllPowerSaveMode (padapter); +leave_all_power_save_mode (padapter);rtw_disassoc_cmd (padapter,500 , false);/* s2-2. indicate disconnect to os */ rtw_indicate_disconnect (padapter);
@@ -999,7 +999,7 @@ void rtw_dev_unload(struct adapter *padapter)/* check HW status and SW state */ netdev_dbg (padapter->pnetdev,"%s: driver in IPS-FWLPS\n" , __func__); -LeaveAllPowerSaveMode (padapter); +leave_all_power_save_mode (padapter); }else {netdev_dbg (padapter->pnetdev,"%s: driver not in IPS\n" , __func__);
@@ -1100,7 +1100,7 @@ void rtw_suspend_common(struct adapter *padapter)rtw_cancel_all_timer (padapter); -LeaveAllPowerSaveModeDirect (padapter); +leave_all_power_save_mode_direct (padapter);rtw_stop_cmd_thread (padapter);
drivers/staging/rtl8723bs/os_dep/sdio_intf.c +1 -1
@@ -404,7 +404,7 @@ static void rtw_dev_remove(struct sdio_func *func)rtw_pm_set_ips (padapter,IPS_NONE );rtw_pm_set_lps (padapter,PS_MODE_ACTIVE ); -LeaveAllPowerSaveMode (padapter); +leave_all_power_save_mode (padapter);rtw_btcoex_HaltNotify (padapter);
--
2.53.0
PATCH 4/4 staging: rtl8723bs: fix CamelCase in security identifiers
In reply to Jose A. Perez de AzpillagaConvert 802.11 authentication algorithm identifiers from CamelCase to snake_case.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 10 +++--- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 12 +++---- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 4 +-- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 +- drivers/staging/rtl8723bs/core/rtw_recv.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 4 +-- drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- .../staging/rtl8723bs/include/rtw_security.h | 6 ++-- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 32 +++++++++---------- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- 12 files changed, 40 insertions(+), 40 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +5 -5
@@ -461,7 +461,7 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)/* ap mode */ rtw_hal_set_odm_var (padapter,HAL_ODM_STA_INFO , psta, true); -if (psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) +if (psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_8021x) psta->ieee8021x_blocked = true;else psta->ieee8021x_blocked = false;
@@ -704,8 +704,8 @@ void start_bss_network(struct adapter *padapter)rtw_hal_set_hwreg (padapter,HW_VAR_AC_PARAM_BK , (u8 *)(&acparm));/* Set Security */ - val8 = (psecuritypriv->dot11AuthAlgrthm == - dot11AuthAlgrthm_8021X) ?0xcc :0xcf ; + val8 = (psecuritypriv->dot11_auth_algrthm == + dot11_auth_algrthm_8021x) ?0xcc :0xcf ;rtw_hal_set_hwreg (padapter,HW_VAR_SEC_CFG , (u8 *)(&val8));/* Beacon Control related register */
@@ -924,7 +924,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) &group_cipher, &pairwise_cipher, NULL) == _SUCCESS) { - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x; psecuritypriv->dot8021xalg =1 ;/* psk, todo:802.1x */ psecuritypriv->wpa_psk |=BIT (1 );
@@ -950,7 +950,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) &group_cipher, &pairwise_cipher, NULL) == _SUCCESS) { - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x; psecuritypriv->dot8021xalg =1 ;/* psk, todo:802.1x */
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +1 -1
@@ -405,7 +405,7 @@ u8 rtw_set_802_11_authentication_mode(struct adapter *padapter, enum ndis_802_11 psecuritypriv->ndisauthtype = authmode;if (psecuritypriv->ndisauthtype >3 ) - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x; res =rtw_set_auth (padapter, psecuritypriv);
drivers/staging/rtl8723bs/core/rtw_mlme.c +6 -6
@@ -987,7 +987,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, strrtw_hal_set_odm_var (padapter,HAL_ODM_STA_INFO , psta, true);/* security related */ -if (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) { +if (padapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x) { padapter->securitypriv.install_grpkey = false; padapter->securitypriv.busetkipkey = false; padapter->securitypriv.bgrpkey_handshake = false;
@@ -1098,7 +1098,7 @@ void rtw_reset_securitypriv(struct adapter *adapter)spin_lock_bh (&adapter->security_key_mutex); -if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) { +if (adapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x) {/* 802.1x */ /* Added by Albert 2009/02/18 */ /* We have to backup the PMK information for WiFi PMK Caching test item. */
@@ -1132,7 +1132,7 @@ void rtw_reset_securitypriv(struct adapter *adapter)/* */ struct security_priv *psec_priv = &adapter->securitypriv; - psec_priv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open;/* open system */ + psec_priv->dot11_auth_algrthm = dot11AuthAlgrthm_Open;/* open system */ psec_priv->dot11PrivacyAlgrthm = _NO_PRIVACY_; psec_priv->dot11PrivacyKeyIndex =0 ;
@@ -1367,7 +1367,7 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)rtw_sta_media_status_rpt (adapter, psta,1 ); -if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) +if (adapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x) psta->dot118021XPrivacy = adapter->securitypriv.dot11PrivacyAlgrthm; psta->ieee8021x_blocked = false;
@@ -1888,7 +1888,7 @@ signed int rtw_set_auth(struct adapter *adapter, struct security_priv *psecurity goto exit; } - psetauthparm->mode = (unsigned char )psecuritypriv->dot11AuthAlgrthm; + psetauthparm->mode = (unsigned char )psecuritypriv->dot11_auth_algrthm; pcmd->cmdcode = _SetAuth_CMD_; pcmd->parmbuf = (unsigned char *)psetauthparm;
@@ -1918,7 +1918,7 @@ signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp goto exit; } -if (psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) +if (psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_8021x) psetkeyparm->algorithm = (unsigned char )psecuritypriv->dot118021XGrpPrivacy;else psetkeyparm->algorithm = (u8 )psecuritypriv->dot11PrivacyAlgrthm;
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +2 -2
@@ -689,7 +689,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame) sa =GetAddr2Ptr (pframe); - auth_mode = psecuritypriv->dot11AuthAlgrthm; + auth_mode = psecuritypriv->dot11_auth_algrthm;if (GetPrivacy (pframe)) {u8 *iv;
@@ -4113,7 +4113,7 @@ void start_clnt_join(struct adapter *padapter)if (caps&WLAN_CAPABILITY_ESS ) {set_msr (padapter,WIFI_FW_STATION_STATE ); - val8 = (pmlmeinfo->auth_algo == dot11AuthAlgrthm_8021X) ?0xcc :0xcf ; + val8 = (pmlmeinfo->auth_algo == dot11_auth_algrthm_8021x) ?0xcc :0xcf ;rtw_hal_set_hwreg (padapter,HW_VAR_SEC_CFG , (u8 *)(&val8));
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +1 -1
@@ -321,7 +321,7 @@ static u8 PS_RDY_CHECK(struct adapter *padapter) )return false; -if (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X && +if (padapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x && !padapter->securitypriv.install_grpkey)return false;
drivers/staging/rtl8723bs/core/rtw_recv.c +1 -1
@@ -512,7 +512,7 @@ static union recv_frame *portctrl(struct adapter *adapter, union recv_frame *pre pstapriv = &adapter->stapriv; - auth_alg = adapter->securitypriv.dot11AuthAlgrthm; + auth_alg = adapter->securitypriv.dot11_auth_algrthm; ptr = precv_frame->u.hdr.rx_data; pfhdr = &precv_frame->u.hdr;
drivers/staging/rtl8723bs/core/rtw_xmit.c +2 -2
@@ -492,13 +492,13 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *p }else {GET_ENCRY_ALGO (psecuritypriv, psta, pattrib->encrypt, bmcast); -switch (psecuritypriv->dot11AuthAlgrthm) { +switch (psecuritypriv->dot11_auth_algrthm) {case dot11AuthAlgrthm_Open:case dot11AuthAlgrthm_Shared:case dot11AuthAlgrthm_Auto: pattrib->key_idx = (u8 )psecuritypriv->dot11PrivacyKeyIndex;break ; -case dot11AuthAlgrthm_8021X: +case dot11_auth_algrthm_8021x:if (bmcast) pattrib->key_idx = (u8 )psecuritypriv->dot118021XGrpKeyid;else
drivers/staging/rtl8723bs/hal/hal_com.c +1 -1
@@ -593,7 +593,7 @@ void SetHwReg(struct adapter *adapter, u8 variable, u8 *val)if (val) {/* Enable default key related setting */ reg_scr |=SCR_TXBCUSEDK ; -if (sec->dot11AuthAlgrthm != dot11AuthAlgrthm_8021X) +if (sec->dot11_auth_algrthm != dot11_auth_algrthm_8021x) reg_scr |= (SCR_RxUseDK|SCR_TxUseDK); }else /* Disable default key related setting */ reg_scr &= ~(SCR_RXBCUSEDK |SCR_TXBCUSEDK |SCR_RxUseDK|SCR_TxUseDK);
drivers/staging/rtl8723bs/include/rtw_mlme.h +1 -1
@@ -46,7 +46,7 @@enum { dot11AuthAlgrthm_Open =0 , dot11AuthAlgrthm_Shared, - dot11AuthAlgrthm_8021X, + dot11_auth_algrthm_8021x, dot11AuthAlgrthm_Auto, dot11AuthAlgrthm_WAPI, dot11AuthAlgrthm_MaxNum
drivers/staging/rtl8723bs/include/rtw_security.h +3 -3
@@ -91,7 +91,7 @@ struct rt_pmkid_list {struct security_priv { -u32 dot11AuthAlgrthm;/* 802.11 auth, could be open, shared, 8021x and authswitch */ +u32 dot11_auth_algrthm;/* 802.11 auth, could be open, shared, 8021x and authswitch */ u32 dot11PrivacyAlgrthm;/* This specify the privacy for shared auth. algorithm. */ /* WEP */
@@ -170,13 +170,13 @@ struct security_priv {#define GET_ENCRY_ALGO (psecuritypriv, psta, encry_algo, bmcst)\ do {\ - switch (psecuritypriv->dot11AuthAlgrthm) {\ + switch (psecuritypriv->dot11_auth_algrthm) {\ case dot11AuthAlgrthm_Open:\ case dot11AuthAlgrthm_Shared:\ case dot11AuthAlgrthm_Auto:\ encry_algo = (u8)psecuritypriv->dot11PrivacyAlgrthm;\ break;\ - case dot11AuthAlgrthm_8021X:\ + case dot11_auth_algrthm_8021x:\ if (bmcst)\ encry_algo = (u8)psecuritypriv->dot118021XGrpPrivacy;\ else\
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +16 -16
@@ -546,7 +546,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_paif (psecuritypriv->bWepDefaultKeyIdxSet ==0 ) {/* wep default key has not been set, so use this key index as default key. */ - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Auto; + psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Auto; psecuritypriv->ndisencryptstatus = Ndis802_11Encryption1Enabled; psecuritypriv->dot11PrivacyAlgrthm = _WEP40_; psecuritypriv->dot118021XGrpPrivacy = _WEP40_;
@@ -616,7 +616,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa goto exit; } -if (psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X && psta) {/* psk/802_1x */ +if (psecuritypriv->dot11_auth_algrthm == dot11_auth_algrthm_8021x && psta) {/* psk/802_1x */ if (check_fwstate (pmlmepriv,WIFI_AP_STATE )) {if (param->u.crypt.set_tx ==1 ) {/* pairwise key */ memcpy (psta->dot118021x_UncstKey.skey, param->u.crypt.key, (param->u.crypt.key_len >16 ?16 : param->u.crypt.key_len));
@@ -764,7 +764,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param goto exit; } -if (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) {/* 802_1x */ +if (padapter->securitypriv.dot11_auth_algrthm == dot11_auth_algrthm_8021x) {/* 802_1x */ struct sta_info *psta, *pbcmc_sta;struct sta_priv *pstapriv = &padapter->stapriv;
@@ -1323,26 +1323,26 @@ static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv,switch (sme_auth_type) {case NL80211_AUTHTYPE_AUTOMATIC : - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Auto; + psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Auto;break ;case NL80211_AUTHTYPE_OPEN_SYSTEM : - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open; + psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open;if (psecuritypriv->ndisauthtype > Ndis802_11AuthModeWPA) - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x;break ;case NL80211_AUTHTYPE_SHARED_KEY : - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Shared; + psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Shared; psecuritypriv->ndisencryptstatus = Ndis802_11Encryption1Enabled;break ;default : - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open; + psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open;/* return -ENOTSUPP; */ }
@@ -1401,9 +1401,9 @@ static int rtw_cfg80211_set_key_mgt(struct security_priv *psecuritypriv, u32 key {if (key_mgt ==WLAN_AKM_SUITE_8021X )/* auth_type = UMAC_AUTH_TYPE_8021X; */ - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x;else if (key_mgt ==WLAN_AKM_SUITE_PSK ) { - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; + psecuritypriv->dot11_auth_algrthm = dot11_auth_algrthm_8021x; }return 0 ;
@@ -1446,7 +1446,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel pwpa =rtw_get_wpa_ie (buf, &wpa_ielen, ielen);if (pwpa && wpa_ielen >0 ) {if (rtw_parse_wpa_ie (pwpa, wpa_ielen +2 , &group_cipher, &pairwise_cipher,NULL ) == _SUCCESS) { - padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; + padapter->securitypriv.dot11_auth_algrthm = dot11_auth_algrthm_8021x; padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeWPAPSK;memcpy (padapter->securitypriv.supplicant_ie, &pwpa[0 ], wpa_ielen +2 ); }
@@ -1455,7 +1455,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel pwpa2 =rtw_get_wpa2_ie (buf, &wpa2_ielen, ielen);if (pwpa2 && wpa2_ielen >0 ) {if (rtw_parse_wpa2_ie (pwpa2, wpa2_ielen +2 , &group_cipher, &pairwise_cipher,NULL ) == _SUCCESS) { - padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; + padapter->securitypriv.dot11_auth_algrthm = dot11_auth_algrthm_8021x; padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeWPA2PSK;memcpy (padapter->securitypriv.supplicant_ie, &pwpa2[0 ], wpa2_ielen +2 ); }
@@ -1578,7 +1578,7 @@ static int cfg80211_rtw_join_ibss(struct wiphy *wiphy, struct net_device *ndev, psecuritypriv->ndisencryptstatus = Ndis802_11EncryptionDisabled; psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_; psecuritypriv->dot118021XGrpPrivacy = _NO_PRIVACY_; - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open;/* open system */ + psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open;/* open system */ psecuritypriv->ndisauthtype = Ndis802_11AuthModeOpen; ret =rtw_cfg80211_set_auth_type (psecuritypriv,NL80211_AUTHTYPE_OPEN_SYSTEM );
@@ -1674,7 +1674,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, psecuritypriv->ndisencryptstatus = Ndis802_11EncryptionDisabled; psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_; psecuritypriv->dot118021XGrpPrivacy = _NO_PRIVACY_; - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open;/* open system */ + psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open;/* open system */ psecuritypriv->ndisauthtype = Ndis802_11AuthModeOpen; ret =rtw_cfg80211_set_wpa_version (psecuritypriv, sme->crypto.wpa_versions);
@@ -1697,8 +1697,8 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, }/* For WEP Shared auth */ -if ((psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_Shared || - psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_Auto) && sme->key) { +if ((psecuritypriv->dot11_auth_algrthm == dot11AuthAlgrthm_Shared || + psecuritypriv->dot11_auth_algrthm == dot11AuthAlgrthm_Auto) && sme->key) {u32 wep_key_idx, wep_key_len, wep_total_len;struct ndis_802_11_wep *pwep =NULL ;
drivers/staging/rtl8723bs/os_dep/os_intfs.c +1 -1
@@ -534,7 +534,7 @@ static void rtw_init_default_value(struct adapter *padapter) psecuritypriv->sw_encrypt = pregistrypriv->software_encrypt; psecuritypriv->sw_decrypt = pregistrypriv->software_decrypt; - psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open;/* open system */ + psecuritypriv->dot11_auth_algrthm = dot11AuthAlgrthm_Open;/* open system */ psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_; psecuritypriv->dot11PrivacyKeyIndex =0 ;
--
2.53.0