Code cleanup patches
cover Code cleanup patches
Fixes complaints reported by checkpatch present in the staging/rtl8723bs module.
Ian To (4):
staging: rtl8723bs: Add missing spaces
staging: rtl8723bs: Split up long lines
staging: rtl8723bs: Remove unnecessary parentheses
staging: rtl8723bs: Format comments
.../staging/rtl8723bs/core/rtw_wlan_util.c | 175 +++++++++--------- 1 file changed, 89 insertions(+), 86 deletions(-)
Signature · 1 line
2.45.3
PATCH 1/4 staging: rtl8723bs: Add missing spaces
Add missing spaces to operators.
Signed-off-by Ian To <[email protected]>
--- .../staging/rtl8723bs/core/rtw_wlan_util.c | 55 ++++++++++--------- 1 file changed, 28 insertions(+), 27 deletions(-)
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +28 -27
@@ -170,10 +170,10 @@ void get_rate_set(struct adapter *padapter, unsigned char *pbssrate, int *bssratvoid set_mcs_rate_by_mask (u8 *mcs_set,u32 mask) { -u8 mcs_rate_1r = (u8)(mask&0xff ); -u8 mcs_rate_2r = (u8)((mask>>8 )&0xff ); -u8 mcs_rate_3r = (u8)((mask>>16 )&0xff ); -u8 mcs_rate_4r = (u8)((mask>>24 )&0xff ); +u8 mcs_rate_1r = (u8)(mask &0xff ); +u8 mcs_rate_2r = (u8)((mask >>8 ) &0xff ); +u8 mcs_rate_3r = (u8)((mask >>16 ) &0xff ); +u8 mcs_rate_4r = (u8)((mask >>24 ) &0xff ); mcs_set[0 ] &= mcs_rate_1r; mcs_set[1 ] &= mcs_rate_2r;
@@ -267,21 +267,22 @@ inline void rtw_set_oper_ch(struct adapter *adapter, u8 ch) dvobj->on_oper_ch_time = jiffies;#ifdef DBG_CH_SWITCH - cnt +=scnprintf (msg+cnt, len-cnt,"switch to ch %3u" , ch); + cnt +=scnprintf (msg + cnt, len - cnt,"switch to ch %3u" , ch);for (i =0 ; i < dvobj->iface_nums; i++) {struct adapter *iface = dvobj->padapters[i]; - cnt +=scnprintf (msg+cnt, len-cnt," [%s:" ,ADPT_ARG (iface)); + cnt +=scnprintf (msg + cnt, len - cnt," [%s:" ,ADPT_ARG (iface));if (iface->mlmeextpriv.cur_channel == ch) - cnt +=scnprintf (msg+cnt, len-cnt,"C" ); + cnt +=scnprintf (msg + cnt, len - cnt,"C" );else - cnt +=scnprintf (msg+cnt, len-cnt,"_" ); -if (iface->wdinfo.listen_channel == ch && !rtw_p2p_chk_state (&iface->wdinfo,P2P_STATE_NONE )) - cnt +=scnprintf (msg+cnt, len-cnt,"L" ); + cnt +=scnprintf (msg + cnt, len - cnt,"_" ); +if (iface->wdinfo.listen_channel == ch && + !rtw_p2p_chk_state (&iface->wdinfo,P2P_STATE_NONE )) + cnt +=scnprintf (msg + cnt, len - cnt,"L" );else - cnt +=scnprintf (msg+cnt, len-cnt,"_" ); - cnt +=scnprintf (msg+cnt, len-cnt,"]" ); + cnt +=scnprintf (msg + cnt, len - cnt,"_" ); + cnt +=scnprintf (msg + cnt, len - cnt,"]" ); }#endif /* DBG_CH_SWITCH */
@@ -431,7 +432,7 @@ void invalidate_cam_all(struct adapter *padapter)spin_lock_bh (&cam_ctl->lock); cam_ctl->bitmap =0 ; -memset (dvobj->cam_cache,0 ,sizeof (struct cam_entry_cache )*TOTAL_CAM_ENTRY ); +memset (dvobj->cam_cache,0 ,sizeof (struct cam_entry_cache ) *TOTAL_CAM_ENTRY );spin_unlock_bh (&cam_ctl->lock); }
@@ -522,7 +523,7 @@ static bool _rtw_camid_is_gk(struct adapter *adapter, u8 cam_id)if (!(cam_ctl->bitmap &BIT (cam_id))) goto exit; - ret = (dvobj->cam_cache[cam_id].ctrl&BIT6 )?true:false; + ret = (dvobj->cam_cache[cam_id].ctrl &BIT6 ) ? true : false; exit:return ret;
@@ -537,7 +538,7 @@ static s16 _rtw_camid_search(struct adapter *adapter, u8 *addr, s16 kid)for (i =0 ; i <TOTAL_CAM_ENTRY ; i++) {if (addr &&memcmp (dvobj->cam_cache[i].mac, addr,ETH_ALEN ))continue ; -if (kid >=0 && kid != (dvobj->cam_cache[i].ctrl&0x03 )) +if (kid >=0 && kid != (dvobj->cam_cache[i].ctrl &0x03 ))continue ; cam_id = i;
@@ -585,7 +586,7 @@ s16 rtw_camid_alloc(struct adapter *adapter, struct sta_info *sta, u8 kid) cam_id = kid; }else {int i; -u8 *addr = sta?sta->hwaddr:NULL ; +u8 *addr = sta ? sta->hwaddr :NULL ;if (!sta) {if (!(mlmeinfo->state &WIFI_FW_ASSOC_SUCCESS )) {
@@ -792,7 +793,7 @@ void WMMOnAssocRsp(struct adapter *padapter)switch (ACI ) {case 0x0 :rtw_hal_set_hwreg (padapter,HW_VAR_AC_PARAM_BE , (u8 *)(&acParm)); - acm_mask |= (ACM ?BIT (1 ):0 ); + acm_mask |= (ACM ?BIT (1 ) :0 ); edca[XMIT_BE_QUEUE ] = acParm;break ;
@@ -804,13 +805,13 @@ void WMMOnAssocRsp(struct adapter *padapter)case 0x2 :rtw_hal_set_hwreg (padapter,HW_VAR_AC_PARAM_VI , (u8 *)(&acParm)); - acm_mask |= (ACM ?BIT (2 ):0 ); + acm_mask |= (ACM ?BIT (2 ) :0 ); edca[XMIT_VI_QUEUE ] = acParm;break ;case 0x3 :rtw_hal_set_hwreg (padapter,HW_VAR_AC_PARAM_VO , (u8 *)(&acParm)); - acm_mask |= (ACM ?BIT (3 ):0 ); + acm_mask |= (ACM ?BIT (3 ) :0 ); edca[XMIT_VO_QUEUE ] = acParm;break ; }
@@ -1175,7 +1176,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) ht_info_infos_0 =0 ; }if (ht_cap_info != cur_network->bcn_info.ht_cap_info || - ((ht_info_infos_0&0x03 ) != (cur_network->bcn_info.ht_info_infos_0&0x03 ))) { + ((ht_info_infos_0 &0x03 ) != (cur_network->bcn_info.ht_info_infos_0 &0x03 ))) { {/* bcn_info_update */ cur_network->bcn_info.ht_cap_info = ht_cap_info;
@@ -1243,12 +1244,12 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) goto _mismatch;if (encryp_protocol ==ENCRYP_PROTOCOL_WPA || encryp_protocol ==ENCRYP_PROTOCOL_WPA2 ) { - pbuf =rtw_get_wpa_ie (&bssid->ies[12 ], &wpa_ielen, bssid->ie_length-12 ); + pbuf =rtw_get_wpa_ie (&bssid->ies[12 ], &wpa_ielen, bssid->ie_length -12 );if (pbuf && (wpa_ielen >0 )) {rtw_parse_wpa_ie (pbuf, wpa_ielen +2 , &group_cipher, &pairwise_cipher, &is_8021x); }else { - pbuf =rtw_get_wpa2_ie (&bssid->ies[12 ], &wpa_ielen, bssid->ie_length-12 ); + pbuf =rtw_get_wpa2_ie (&bssid->ies[12 ], &wpa_ielen, bssid->ie_length -12 );if (pbuf && (wpa_ielen >0 )) rtw_parse_wpa2_ie(pbuf, wpa_ielen + 2, &group_cipher,
@@ -1635,7 +1636,7 @@ void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr)if (psta) { param =le16_to_cpu (preq->BA_para_set); - tid = (param>>2 )&0x0f ; + tid = (param >>2 ) &0x0f ; preorder_ctrl = &psta->recvreorder_ctrl[tid];
@@ -1653,7 +1654,7 @@ void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len) pIE = pframe +sizeof (struct ieee80211_hdr_3addr ); pbuf = (__le32 *)pIE; - pmlmeext->TSFValue =le32_to_cpu (*(pbuf+1 )); + pmlmeext->TSFValue =le32_to_cpu (*(pbuf +1 )); pmlmeext->TSFValue = pmlmeext->TSFValue <<32 ;
@@ -1679,14 +1680,14 @@ void adaptive_early_32k(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len) pIE = pframe +sizeof (struct ieee80211_hdr_3addr ); pbuf = (__le32 *)pIE; - tsf =le32_to_cpu (*(pbuf+1 )); + tsf =le32_to_cpu (*(pbuf +1 )); tsf = tsf <<32 ; tsf |=le32_to_cpu (*pbuf);/* delay = (timestamp mod 1024*100)/1000 (unit: ms) */ /* delay_ms = do_div(tsf, (pmlmeinfo->bcn_interval*1024))/1000; */ - delay_ms =do_div (tsf, (pmlmeinfo->bcn_interval*1024 )); - delay_ms = delay_ms/1000 ; + delay_ms =do_div (tsf, (pmlmeinfo->bcn_interval *1024 )); + delay_ms = delay_ms /1000 ;if (delay_ms >=8 ) pmlmeext->bcn_delay_cnt[8 ]++;
Signature · 1 line
2.45.3
PATCH 2/4 staging: rtl8723bs: Split up long lines
In reply to Ian ToLong lines were present and split up.
Signed-off-by Ian To <[email protected]>
--- .../staging/rtl8723bs/core/rtw_wlan_util.c | 38 ++++++++++++------- 1 file changed, 24 insertions(+), 14 deletions(-)
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +24 -14
@@ -336,13 +336,13 @@ void r8723bs_select_channel(struct adapter *padapter, unsigned char channel)mutex_unlock (&(adapter_to_dvobj (padapter)->setch_mutex)); } -void set_channel_bwmode (struct adapter *padapter,unsigned char channel,unsigned char channel_offset,unsigned short bwmode) +void set_channel_bwmode (struct adapter *padapter,unsigned char channel, +unsigned char channel_offset,unsigned short bwmode) {u8 center_ch, chnl_offset80 =HAL_PRIME_CHNL_OFFSET_DONT_CARE ; center_ch =rtw_get_center_ch (channel, bwmode, channel_offset); -/* set Channel */ if (mutex_lock_interruptible (&(adapter_to_dvobj (padapter)->setch_mutex)))return ;
@@ -352,7 +352,8 @@ void set_channel_bwmode(struct adapter *padapter, unsigned char channel, unsignertw_set_oper_bw (padapter, bwmode);rtw_set_oper_choffset (padapter, channel_offset); -rtw_hal_set_chnl_bw (padapter, center_ch, bwmode, channel_offset, chnl_offset80);/* set center channel */ +/* set center channel */ +rtw_hal_set_chnl_bw (padapter, center_ch, bwmode, channel_offset, chnl_offset80);mutex_unlock (&(adapter_to_dvobj (padapter)->setch_mutex)); }
@@ -382,7 +383,8 @@ int is_client_associated_to_ap(struct adapter *padapter) pmlmeext = &padapter->mlmeextpriv; pmlmeinfo = &(pmlmeext->mlmext_info); -if ((pmlmeinfo->state &WIFI_FW_ASSOC_SUCCESS ) && ((pmlmeinfo->state&0x03 ) ==WIFI_FW_STATION_STATE )) +if ((pmlmeinfo->state &WIFI_FW_ASSOC_SUCCESS ) && + ((pmlmeinfo->state &0x03 ) ==WIFI_FW_STATION_STATE ))return true;else return _FAIL;
@@ -393,7 +395,8 @@ int is_client_associated_to_ibss(struct adapter *padapter)struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -if ((pmlmeinfo->state &WIFI_FW_ASSOC_SUCCESS ) && ((pmlmeinfo->state&0x03 ) ==WIFI_FW_ADHOC_STATE )) +if ((pmlmeinfo->state &WIFI_FW_ASSOC_SUCCESS ) && + ((pmlmeinfo->state &0x03 ) ==WIFI_FW_ADHOC_STATE ))return true;else return _FAIL;
@@ -468,7 +471,8 @@ void _write_cam(struct adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *key)void _clear_cam_entry (struct adapter *padapter,u8 entry) {unsigned char null_sta[] = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 }; -unsigned char null_key[] = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 }; +unsigned char null_key[] = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 };_write_cam (padapter, entry,0 , null_sta, null_key); }
@@ -572,8 +576,8 @@ s16 rtw_camid_alloc(struct adapter *adapter, struct sta_info *sta, u8 kid) mlmeinfo = &adapter->mlmeextpriv.mlmext_info; -if ((((mlmeinfo->state&0x03 ) ==WIFI_FW_AP_STATE ) || ((mlmeinfo->state&0x03 ) ==WIFI_FW_ADHOC_STATE )) - && !sta) { +if ((((mlmeinfo->state &0x03 ) ==WIFI_FW_AP_STATE ) || + ((mlmeinfo->state &0x03 ) ==WIFI_FW_ADHOC_STATE )) && !sta) {/* AP/Ad-hoc mode group key: static alloction to default key by key ID */ if (kid >3 ) { netdev_dbg(adapter->pnetdev,
@@ -1142,7 +1146,9 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)if (!bssid)return true; -if ((pmlmepriv->timeBcnInfoChkStart !=0 ) && (jiffies_to_msecs (jiffies - pmlmepriv->timeBcnInfoChkStart) >DISCONNECT_BY_CHK_BCN_FAIL_OBSERV_PERIOD_IN_MS )) { +if ((pmlmepriv->timeBcnInfoChkStart !=0 ) && + (jiffies_to_msecs (jiffies - pmlmepriv->timeBcnInfoChkStart) > +DISCONNECT_BY_CHK_BCN_FAIL_OBSERV_PERIOD_IN_MS )) { pmlmepriv->timeBcnInfoChkStart =0 ; pmlmepriv->NumOfBcnInfoChkFail =0 ; }
@@ -1214,7 +1220,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) bssid->ssid.ssid_length = ssid_len;if (memcmp (bssid->ssid.ssid, cur_network->network.ssid.ssid,32 ) || - bssid->ssid.ssid_length != cur_network->network.ssid.ssid_length) + bssid->ssid.ssid_length != cur_network->network.ssid.ssid_length)if (bssid->ssid.ssid[0 ] !='\0' && bssid->ssid.ssid_length !=0 )/* not hidden ssid */ goto _mismatch;
@@ -1275,8 +1281,10 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) pmlmepriv->NumOfBcnInfoChkFail++; -if ((pmlmepriv->timeBcnInfoChkStart !=0 ) && (jiffies_to_msecs (jiffies - pmlmepriv->timeBcnInfoChkStart) <=DISCONNECT_BY_CHK_BCN_FAIL_OBSERV_PERIOD_IN_MS ) - && (pmlmepriv->NumOfBcnInfoChkFail >=DISCONNECT_BY_CHK_BCN_FAIL_THRESHOLD )) { +if ((pmlmepriv->timeBcnInfoChkStart !=0 ) && + (jiffies_to_msecs (jiffies - pmlmepriv->timeBcnInfoChkStart) <= +DISCONNECT_BY_CHK_BCN_FAIL_OBSERV_PERIOD_IN_MS ) && + (pmlmepriv->NumOfBcnInfoChkFail >=DISCONNECT_BY_CHK_BCN_FAIL_THRESHOLD )) { pmlmepriv->timeBcnInfoChkStart =0 ; pmlmepriv->NumOfBcnInfoChkFail =0 ;return _FAIL;
@@ -1337,7 +1345,8 @@ unsigned int is_ap_in_tkip(struct adapter *padapter)switch (pIE->element_id) {case WLAN_EID_VENDOR_SPECIFIC : -if ((!memcmp (pIE->data,RTW_WPA_OUI ,4 )) && (!memcmp ((pIE->data +12 ),WPA_TKIP_CIPHER ,4 ))) +if ((!memcmp (pIE->data,RTW_WPA_OUI ,4 )) && + (!memcmp ((pIE->data +12 ),WPA_TKIP_CIPHER ,4 )))return true;break ;
@@ -1440,7 +1449,8 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)switch (pIE->element_id) {case WLAN_EID_VENDOR_SPECIFIC : -if ((!memcmp (pIE->data,ARTHEROS_OUI1 ,3 )) || (!memcmp (pIE->data,ARTHEROS_OUI2 ,3 ))) +if ((!memcmp (pIE->data,ARTHEROS_OUI1 ,3 )) || + (!memcmp (pIE->data,ARTHEROS_OUI2 ,3 )))return HT_IOT_PEER_ATHEROS ; else if ((!memcmp(pIE->data, BROADCOM_OUI1, 3)) || (!memcmp(pIE->data, BROADCOM_OUI2, 3)) ||
Signature · 1 line
2.45.3
PATCH 3/4 staging: rtl8723bs: Remove unnecessary parentheses
In reply to Ian ToUnnecessary parentheses were present and removed
Signed-off-by Ian To <[email protected]>
--- .../staging/rtl8723bs/core/rtw_wlan_util.c | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-)
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +34 -34
@@ -381,7 +381,7 @@ int is_client_associated_to_ap(struct adapter *padapter)return _FAIL; pmlmeext = &padapter->mlmeextpriv; - pmlmeinfo = &(pmlmeext->mlmext_info); + pmlmeinfo = &pmlmeext->mlmext_info;if ((pmlmeinfo->state &WIFI_FW_ASSOC_SUCCESS ) && ((pmlmeinfo->state &0x03 ) ==WIFI_FW_STATION_STATE ))
@@ -393,7 +393,7 @@ int is_client_associated_to_ap(struct adapter *padapter)int is_client_associated_to_ibss (struct adapter *padapter) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if ((pmlmeinfo->state &WIFI_FW_ASSOC_SUCCESS ) && ((pmlmeinfo->state &0x03 ) ==WIFI_FW_ADHOC_STATE ))
@@ -406,7 +406,7 @@ int is_IBSS_empty(struct adapter *padapter) {unsigned int i;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;for (i =IBSS_START_MAC_ID ; i <NUM_STA ; i++) {if (pmlmeinfo->FW_sta_info[i].status ==1 )
@@ -510,7 +510,7 @@ void clear_cam_cache(struct adapter *adapter, u8 id)spin_lock_bh (&cam_ctl->lock); -memset (&(dvobj->cam_cache[id]),0 ,sizeof (struct cam_entry_cache )); +memset (&dvobj->cam_cache[id],0 ,sizeof (struct cam_entry_cache ));spin_unlock_bh (&cam_ctl->lock); }
@@ -660,7 +660,7 @@ int allocate_fw_sta_entry(struct adapter *padapter) {unsigned int mac_id;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;for (mac_id =IBSS_START_MAC_ID ; mac_id <NUM_STA ; mac_id++) {if (pmlmeinfo->FW_sta_info[mac_id].status ==0 ) {
@@ -676,7 +676,7 @@ int allocate_fw_sta_entry(struct adapter *padapter)void flush_all_cam_entry (struct adapter *padapter) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;invalidate_cam_all (padapter);/* clear default key related key search setting */
@@ -688,19 +688,19 @@ void flush_all_cam_entry(struct adapter *padapter)int WMM_param_handler (struct adapter *padapter,struct ndis_80211_var_ie *pIE) {/* struct registry_priv *pregpriv = &padapter->registrypriv; */ -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if (pmlmepriv->qospriv.qos_option ==0 ) { pmlmeinfo->WMM_enable =0 ;return false; } -if (!memcmp (&(pmlmeinfo->WMM_param), (pIE->data +6 ),sizeof (struct WMM_para_element ))) +if (!memcmp (&pmlmeinfo->WMM_param, (pIE->data +6 ),sizeof (struct WMM_para_element )))return false;else -memcpy (&(pmlmeinfo->WMM_param), (pIE->data +6 ),sizeof (struct WMM_para_element )); +memcpy (&pmlmeinfo->WMM_param, (pIE->data +6 ),sizeof (struct WMM_para_element )); pmlmeinfo->WMM_enable =1 ;return true;
@@ -740,7 +740,7 @@ void WMMOnAssocRsp(struct adapter *padapter)u32 acParm, i;u32 edca[4 ], inx[4 ];struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct xmit_priv *pxmitpriv = &padapter->xmitpriv;struct registry_priv *pregpriv = &padapter->registrypriv;
@@ -841,9 +841,9 @@ static void bwmode_update_check(struct adapter *padapter, struct ndis_80211_var_unsigned char new_bwmode;unsigned char new_ch_offset;struct HT_info_element *pHT_info; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct registry_priv *pregistrypriv = &padapter->registrypriv;struct ht_priv *phtpriv = &pmlmepriv->htpriv;u8 cbw40_enable =0 ;
@@ -903,7 +903,7 @@ static void bwmode_update_check(struct adapter *padapter, struct ndis_80211_var_if (true == pmlmeinfo->bwmode_updated) {struct sta_info *psta; -struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); +struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;struct sta_priv *pstapriv = &padapter->stapriv;/* set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); */
@@ -933,7 +933,7 @@ void HT_caps_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE)u8 max_AMPDU_len, min_MPDU_spacing;u8 cur_ldpc_cap =0 , cur_stbc_cap =0 ;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct ht_priv *phtpriv = &pmlmepriv->htpriv;
@@ -996,7 +996,7 @@ void HT_caps_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE)void HT_info_handler (struct adapter *padapter,struct ndis_80211_var_ie *pIE) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct ht_priv *phtpriv = &pmlmepriv->htpriv;
@@ -1010,7 +1010,7 @@ void HT_info_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE)return ; pmlmeinfo->HT_info_enable =1 ; -memcpy (&(pmlmeinfo->HT_info), pIE->data, pIE->length); +memcpy (&pmlmeinfo->HT_info, pIE->data, pIE->length); }void HTOnAssocRsp (struct adapter *padapter)
@@ -1019,7 +1019,7 @@ void HTOnAssocRsp(struct adapter *padapter)unsigned char min_MPDU_spacing;/* struct registry_priv *pregpriv = &padapter->registrypriv; */ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable)) { pmlmeinfo->HT_enable =1 ;
@@ -1046,20 +1046,20 @@ void HTOnAssocRsp(struct adapter *padapter)void ERP_IE_handler (struct adapter *padapter,struct ndis_80211_var_ie *pIE) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if (pIE->length >1 )return ; pmlmeinfo->ERP_enable =1 ; -memcpy (&(pmlmeinfo->ERP_IE), pIE->data, pIE->length); +memcpy (&pmlmeinfo->ERP_IE, pIE->data, pIE->length); }void VCS_update (struct adapter *padapter,struct sta_info *psta) {struct registry_priv *pregpriv = &padapter->registrypriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;switch (pregpriv->vrtl_carrier_sense) {/* 0:off 1:on 2:auto */ case 0 :/* off */
@@ -1114,7 +1114,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)unsigned int len;unsigned char *p;unsigned short val16, subtype; -struct wlan_network *cur_network = &(Adapter->mlmepriv.cur_network); +struct wlan_network *cur_network = &Adapter->mlmepriv.cur_network;/* u8 wpa_ie[255], rsn_ie[255]; */ u16 wpa_len =0 , rsn_len =0 ;u8 encryp_protocol =0 ;
@@ -1336,8 +1336,8 @@ unsigned int is_ap_in_tkip(struct adapter *padapter)u32 i;struct ndis_80211_var_ie *pIE;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;if (rtw_get_capability ((struct wlan_bssid_ex *)cur_network) &WLAN_CAPABILITY_PRIVACY ) {for (i =sizeof (struct ndis_802_11_fix_ie ); i < pmlmeinfo->network.ie_length;) {
@@ -1373,7 +1373,7 @@ int support_short_GI(struct adapter *padapter, struct HT_caps_element *pHT_caps, {unsigned char bit_offset;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if (!(pmlmeinfo->HT_enable))return _FAIL;
@@ -1482,7 +1482,7 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)void update_IOT_info (struct adapter *padapter) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;switch (pmlmeinfo->assoc_AP_vendor) {case HT_IOT_PEER_MARVELL :
@@ -1512,7 +1512,7 @@ void update_IOT_info(struct adapter *padapter)void update_capinfo (struct adapter *Adapter,u16 updateCap) {struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;bool ShortPreamble;/* Check preamble mode, 2005.01.06, by rcnjko. */
@@ -1564,8 +1564,8 @@ void update_wireless_mode(struct adapter *padapter)int network_type =0 ;u32 SIFS_Timer;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;unsigned char *rate = cur_network->supported_rates;if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable))
@@ -1588,7 +1588,7 @@ void update_wireless_mode(struct adapter *padapter)SetHwReg8723BS (padapter,HW_VAR_RESP_SIFS , (u8 *)&SIFS_Timer); -SetHwReg8723BS (padapter,HW_VAR_WIRELESS_MODE , (u8 *)&(pmlmeext->cur_wireless_mode)); +SetHwReg8723BS (padapter,HW_VAR_WIRELESS_MODE , (u8 *)&pmlmeext->cur_wireless_mode);if (pmlmeext->cur_wireless_mode &WIRELESS_11B )update_mgnt_tx_rate (padapter,IEEE80211_CCK_RATE_1MB );
@@ -1613,8 +1613,8 @@ int update_sta_support_rate(struct adapter *padapter, u8 *pvar_ie, uint var_ie_lunsigned int ie_len;struct ndis_80211_var_ie *pIE;int supportRateNum =0 ; -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; pIE = (struct ndis_80211_var_ie *)rtw_get_ie (pvar_ie,WLAN_EID_SUPP_RATES , &ie_len, var_ie_len);if (!pIE)
@@ -1640,7 +1640,7 @@ void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr)struct sta_priv *pstapriv = &padapter->stapriv;struct ADDBA_request *preq = (struct ADDBA_request *)paddba_req;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; psta =rtw_get_stainfo (pstapriv, addr);
@@ -1683,7 +1683,7 @@ void adaptive_early_32k(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len)__le32 *pbuf;u64 tsf =0 ;u32 delay_ms; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; pmlmeext->bcn_cnt++;
Signature · 1 line
2.45.3
PATCH 4/4 staging: rtl8723bs: Format comments
In reply to Ian ToMake comments adhere to the coding style.
Signed-off-by Ian To <[email protected]>
--- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +3 -11
@@ -1031,9 +1031,9 @@ void HTOnAssocRsp(struct adapter *padapter)/* handle A-MPDU parameter field */ /* -AMPDU_para [1:0]:Max AMPDU Len => 0:8k , 1:16k, 2:32k, 3:64k -AMPDU_para [4:2]:Min MPDU Start Spacing -*/ +* AMPDU_para [1:0]:Max AMPDU Len => 0:8k , 1:16k, 2:32k, 3:64k +* AMPDU_para [4:2]:Min MPDU Start Spacing +*/ max_AMPDU_len = pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para &0x03 ; min_MPDU_spacing = (pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para &0x1c ) >>2 ;
@@ -1706,14 +1706,6 @@ void adaptive_early_32k(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len) pmlmeext->bcn_delay_cnt[delay_ms]++;/* pmlmeext->bcn_delay_ratio[delay_ms] = (pmlmeext->bcn_delay_cnt[delay_ms] * 100) /pmlmeext->bcn_cnt; */ -/* - -for (i = 0; i<9; i++) -{ -pmlmeext->bcn_delay_cnt[i] , i, pmlmeext->bcn_delay_ratio[i]); -} -*/ -/* dump for adaptive_early_32k */ if (pmlmeext->bcn_cnt >100 && (pmlmeext->adaptive_tsf_done == true)) {u8 ratio_20_delay, ratio_80_delay;
Signature · 1 line
2.45.3