staging: rtl8723bs: remove unnecessary parentheses
PATCH 1/1 staging: rtl8723bs: remove unnecessary parentheses
Remove unnecessary parentheses to clear checkpatch.pl warnings
Example of fixed warnings:
CHECK: Unnecessary parentheses around dvobj->cam_cache[id]
CHECK: Unnecessary parentheses around 'val != 0xfe'
Checkpatch warnings regarding line length above 100 columns on modified lines were also fixed
Signed-off-by Eugene Mavick <[email protected]>
--- .../staging/rtl8723bs/core/rtw_wlan_util.c | 92 ++++++++++--------- 1 file changed, 48 insertions(+), 44 deletions(-)
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +48 -44
@@ -118,7 +118,7 @@ int is_basicrate(struct adapter *padapter, unsigned char rate)for (i =0 ; i < NumRates; i++) { val = pmlmeext->basicrate[i]; -if ((val !=0xff ) && (val !=0xfe )) +if (val !=0xff && val !=0xfe )if (rate ==ratetbl_val_2wifirate (val))return true; }
@@ -351,7 +351,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 ))return true;
@@ -362,7 +362,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 ))return true;
@@ -374,7 +374,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 )
@@ -477,7 +477,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); }
@@ -629,7 +629,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 ) {
@@ -645,7 +645,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 */
@@ -657,19 +657,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; -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;
@@ -709,7 +709,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;
@@ -810,9 +810,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 ;
@@ -853,7 +853,7 @@ static void bwmode_update_check(struct adapter *padapter, struct ndis_80211_var_ new_ch_offset =HAL_PRIME_CHNL_OFFSET_DONT_CARE ; } -if ((new_bwmode != pmlmeext->cur_bwmode) || (new_ch_offset != pmlmeext->cur_ch_offset)) { +if (new_bwmode != pmlmeext->cur_bwmode || new_ch_offset != pmlmeext->cur_ch_offset) { pmlmeinfo->bwmode_updated = true; pmlmeext->cur_bwmode = new_bwmode;
@@ -867,7 +867,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); */
@@ -897,7 +897,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;
@@ -960,7 +960,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;
@@ -974,7 +974,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)
@@ -983,9 +983,9 @@ 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)) { +if (pmlmeinfo->HT_info_enable && pmlmeinfo->HT_caps_enable) { pmlmeinfo->HT_enable =1 ; }else { pmlmeinfo->HT_enable =0 ;
@@ -1010,20 +1010,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 */
@@ -1043,7 +1043,7 @@ void VCS_update(struct adapter *padapter, struct sta_info *psta)case 2 :/* auto */ default : -if ((pmlmeinfo->ERP_enable) && (pmlmeinfo->ERP_IE &BIT (1 ))) { +if (pmlmeinfo->ERP_enable && (pmlmeinfo->ERP_IE &BIT (1 ))) {if (pregpriv->vcs_type ==1 ) { psta->rtsen =1 ; psta->cts2self =0 ;
@@ -1078,7 +1078,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 ;
@@ -1110,7 +1110,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 ; }
@@ -1213,13 +1215,13 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)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 ); -if (pbuf && (wpa_ielen >0 )) { +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 ); -if (pbuf && (wpa_ielen >0 )) +if (pbuf && wpa_ielen >0 )rtw_parse_wpa2_ie (pbuf, wpa_ielen +2 , &group_cipher, &pairwise_cipher, &is_8021x); }
@@ -1243,8 +1245,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;
@@ -1296,8 +1300,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;) {
@@ -1332,7 +1336,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;
@@ -1438,7 +1442,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 :
@@ -1468,7 +1472,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. */
@@ -1520,11 +1524,11 @@ 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)) +if (pmlmeinfo->HT_info_enable && pmlmeinfo->HT_caps_enable) pmlmeinfo->HT_enable =1 ;if (pmlmeinfo->HT_enable)
@@ -1544,7 +1548,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 );
@@ -1569,8 +1573,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 support_rate_num =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)
@@ -1596,7 +1600,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);
@@ -1639,7 +1643,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.51.2
PATCH v2 1/1 staging: rtl8723bs: remove unnecessary parentheses
Remove unnecessary parentheses to clear checkpatch.pl warnings
Example of fixed warnings:
CHECK: Unnecessary parentheses around dvobj->cam_cache[id]
CHECK: Unnecessary parentheses around 'val != 0xfe'
Checkpatch warnings regarding line length above 100 columns on modified lines were also fixed
Signed-off-by Eugene Mavick <[email protected]>
---V1->V2:
Fixed following checkpatch warnings on modified lines:
CHECK: Alignment should match open parenthesis(line 1114, 1249)
CHECK: Logical continuations should be on the previous line(line 1251)
v1: https://lore.kernel.org/all/[email protected]/
.../staging/rtl8723bs/core/rtw_wlan_util.c | 93 ++++++++++--------- 1 file changed, 49 insertions(+), 44 deletions(-)
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +49 -44
@@ -118,7 +118,7 @@ int is_basicrate(struct adapter *padapter, unsigned char rate)for (i =0 ; i < NumRates; i++) { val = pmlmeext->basicrate[i]; -if ((val !=0xff ) && (val !=0xfe )) +if (val !=0xff && val !=0xfe )if (rate ==ratetbl_val_2wifirate (val))return true; }
@@ -351,7 +351,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 ))return true;
@@ -362,7 +362,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 ))return true;
@@ -374,7 +374,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 )
@@ -477,7 +477,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); }
@@ -629,7 +629,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 ) {
@@ -645,7 +645,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 */
@@ -657,19 +657,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; -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;
@@ -709,7 +709,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;
@@ -810,9 +810,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 ;
@@ -853,7 +853,7 @@ static void bwmode_update_check(struct adapter *padapter, struct ndis_80211_var_ new_ch_offset =HAL_PRIME_CHNL_OFFSET_DONT_CARE ; } -if ((new_bwmode != pmlmeext->cur_bwmode) || (new_ch_offset != pmlmeext->cur_ch_offset)) { +if (new_bwmode != pmlmeext->cur_bwmode || new_ch_offset != pmlmeext->cur_ch_offset) { pmlmeinfo->bwmode_updated = true; pmlmeext->cur_bwmode = new_bwmode;
@@ -867,7 +867,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); */
@@ -897,7 +897,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;
@@ -960,7 +960,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;
@@ -974,7 +974,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)
@@ -983,9 +983,9 @@ 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)) { +if (pmlmeinfo->HT_info_enable && pmlmeinfo->HT_caps_enable) { pmlmeinfo->HT_enable =1 ; }else { pmlmeinfo->HT_enable =0 ;
@@ -1010,20 +1010,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 */
@@ -1043,7 +1043,7 @@ void VCS_update(struct adapter *padapter, struct sta_info *psta)case 2 :/* auto */ default : -if ((pmlmeinfo->ERP_enable) && (pmlmeinfo->ERP_IE &BIT (1 ))) { +if (pmlmeinfo->ERP_enable && (pmlmeinfo->ERP_IE &BIT (1 ))) {if (pregpriv->vcs_type ==1 ) { psta->rtsen =1 ; psta->cts2self =0 ;
@@ -1078,7 +1078,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 ;
@@ -1110,7 +1110,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 ; }
@@ -1213,13 +1215,13 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)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 ); -if (pbuf && (wpa_ielen >0 )) { +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 ); -if (pbuf && (wpa_ielen >0 )) +if (pbuf && wpa_ielen >0 )rtw_parse_wpa2_ie (pbuf, wpa_ielen +2 , &group_cipher, &pairwise_cipher, &is_8021x); }
@@ -1243,8 +1245,11 @@ 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;
@@ -1296,8 +1301,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;) {
@@ -1332,7 +1337,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;
@@ -1438,7 +1443,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 :
@@ -1468,7 +1473,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. */
@@ -1520,11 +1525,11 @@ 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)) +if (pmlmeinfo->HT_info_enable && pmlmeinfo->HT_caps_enable) pmlmeinfo->HT_enable =1 ;if (pmlmeinfo->HT_enable)
@@ -1544,7 +1549,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 );
@@ -1569,8 +1574,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 support_rate_num =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)
@@ -1596,7 +1601,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);
@@ -1639,7 +1644,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.51.2
Quoted 26 lines · Eugene Mavick
Remove unnecessary parentheses to clear checkpatch.pl warnings
Example of fixed warnings:
CHECK: Unnecessary parentheses around dvobj->cam_cache[id]
CHECK: Unnecessary parentheses around 'val !=0xfe'Checkpatch warnings regarding line length above 100 columns on modified lines were also fixed
Signed-off-by Eugene Mavick <[email protected]>---
V1->V2:
Fixed following checkpatch warnings on modified lines:
CHECK: Alignment should match openparenthesis(line 1114, 1249)
CHECK: Logical continuations should be on the previous line(line 1251)v1: https://lore.kernel.org/all/[email protected]/
.../staging/rtl8723bs/core/rtw_wlan_util.c | 93 ++++++++++--------- 1 file changed, 49 insertions(+), 44 deletions(-)drivers/staging/rtl8723bs/core/rtw_wlan_util.c +0
-0
drivers/staging/rtl8723bs/core/rtw_wlan_util.c int is_basicrate(struct adapter *padapter, unsigned char rate) · line 121
Quoted 5 lines
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1
-1@@ -118,7 +118,7 @@ int is_basicrate(struct adapter *padapter, unsigned char rate)for (i =0 ; i < NumRates; i++) { val = pmlmeext->basicrate[i]; -if ((val !=0xff ) && (val !=0xfe )) +if (val !=0xff && val !=0xfe )
Just leave this one as-is. (staging rules). We deliberately silenced this checkpatch warning so it's weird for checkpatch to complain. Same for the other conditions.
drivers/staging/rtl8723bs/core/rtw_wlan_util.c int is_client_associated_to_ap(struct adapter *padapter) · line 354
Quoted 9 lines
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1
-1if (rate ==ratetbl_val_2wifirate (val))return true; }@@ -351,7 +351,7 @@ int is_client_associated_to_ap(struct adapter *padapter)return _FAIL; pmlmeext = &padapter->mlmeextpriv; - pmlmeinfo = &(pmlmeext->mlmext_info); + pmlmeinfo = &pmlmeext->mlmext_info;
These changes are fine though. Can you resend without the condtion changes?
regards,
dan carpenter
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 5 lines · Eugene Mavick
Remove unnecessary parentheses to clear checkpatch.pl warnings
Example of fixed warnings:
CHECK: Unnecessary parentheses around dvobj->cam_cache[id]
CHECK: Unnecessary parentheses around 'val !=0xfe'
No, leave these. It's a staging specific rule. I even modified checkpatch to not warn about these so I'm not sure how you are seeing them. I just tested again and checkpatch doesn't warn...
regards,
dan carpenter
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 3 lines · Eugene Mavick
My previous reply can be disregarded, I realise a few of the parantheses removals are still present in the v3. I will correct those and send a v4.
Heh. Yes. And also the commit message says there are some.
regards,
dan carpenter
PATCH v4 1/1 staging: rtl8723bs: remove unnecessary parentheses
In reply to a message not in the archiveRemove unnecessary parentheses to clear checkpatch.pl warnings
Example of fixed warnings:
CHECK: Unnecessary parentheses around dvobj->cam_cache[id]
Signed-off-by Eugene Mavick <[email protected]>
---
V1->V2:
Fixed following checkpatch warnings on modified lines:
CHECK: Alignment should match open parenthesis(line 1114, 1249)
CHECK: Logical continuations should be on the previous line(line 1251)
V2->V3:
Removed comparison-statement-parentheses-removals(CSPR) per Dan Carpenter's review:
https://lore.kernel.org/all/[email protected]/
V3->V4:
Removed overlooked CSPR;
Removed misleading fixed-warning-example in commit message suggesting CSPR were still present
v1: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
.../staging/rtl8723bs/core/rtw_wlan_util.c | 85 ++++++++++--------- 1 file changed, 44 insertions(+), 41 deletions(-)
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +44 -41
@@ -351,7 +351,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 ))return true;
@@ -362,7 +362,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 ))return true;
@@ -374,7 +374,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 )
@@ -477,7 +477,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); }
@@ -629,7 +629,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 ) {
@@ -645,7 +645,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 */
@@ -657,19 +657,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; -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;
@@ -709,7 +709,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;
@@ -810,9 +810,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 ;
@@ -867,7 +867,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); */
@@ -897,7 +897,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;
@@ -960,7 +960,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;
@@ -974,7 +974,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)
@@ -983,9 +983,9 @@ 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)) { +if (pmlmeinfo->HT_info_enable && pmlmeinfo->HT_caps_enable) { pmlmeinfo->HT_enable =1 ; }else { pmlmeinfo->HT_enable =0 ;
@@ -1010,20 +1010,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 */
@@ -1043,7 +1043,7 @@ void VCS_update(struct adapter *padapter, struct sta_info *psta)case 2 :/* auto */ default : -if ((pmlmeinfo->ERP_enable) && (pmlmeinfo->ERP_IE &BIT (1 ))) { +if (pmlmeinfo->ERP_enable && (pmlmeinfo->ERP_IE &BIT (1 ))) {if (pregpriv->vcs_type ==1 ) { psta->rtsen =1 ; psta->cts2self =0 ;
@@ -1078,7 +1078,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 ;
@@ -1213,13 +1213,13 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)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 ); -if (pbuf && (wpa_ielen >0 )) { +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 ); -if (pbuf && (wpa_ielen >0 )) +if (pbuf && wpa_ielen >0 )rtw_parse_wpa2_ie (pbuf, wpa_ielen +2 , &group_cipher, &pairwise_cipher, &is_8021x); }
@@ -1243,8 +1243,11 @@ 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;
@@ -1296,8 +1299,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;) {
@@ -1332,7 +1335,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;
@@ -1438,7 +1441,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 :
@@ -1468,7 +1471,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. */
@@ -1520,11 +1523,11 @@ 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)) +if (pmlmeinfo->HT_info_enable && pmlmeinfo->HT_caps_enable) pmlmeinfo->HT_enable =1 ;if (pmlmeinfo->HT_enable)
@@ -1544,7 +1547,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 );
@@ -1569,8 +1572,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 support_rate_num =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)
@@ -1596,7 +1599,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);
@@ -1639,7 +1642,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.51.2
Quoted 7 lines · Eugene Mavick
Remove unnecessary parentheses to clear checkpatch.pl warnings
Example of fixed warnings:
CHECK: Unnecessary parentheses around dvobj->cam_cache[id]Signed-off-by Eugene Mavick <[email protected]>---
When I'm reviewing patches one thing that I'm checking is that if people deliberately tries to slip something unexpected into the patch. I created a script to help me strip away many of the common staging changes so I can focus on the interesting stuff.
https://github.com/error27/rename_rev
This is v4 of this patch and so at this point what I really want is for my script to say there is nothing unexpected at all. Almost everything here is related to the checkpatch warning about &(foo->bar). Some of the other changes are good, but at this point, I just want to get something we can apply. Do the other changes in a different patch.
Here is the output from my script that I want removed.
cat email.txt | rename_rev.pl -r amp
drivers/staging/rtl8723bs/core/rtw_wlan_util.c void HTOnAssocRsp(struct adapter *padapter) · line 988
Quoted 5 lines
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1
-1struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; -if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable)) { +if (pmlmeinfo->HT_info_enable && pmlmeinfo->HT_caps_enable) {
Good but do it in another patch.
drivers/staging/rtl8723bs/core/rtw_wlan_util.c line 155
Quoted 9 lines
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1
-1pmlmeinfo->HT_enable =1 ; }else { pmlmeinfo->HT_enable =0 ;@@ -152,7 +152,7 @@case 2 :/* auto */ default : -if ((pmlmeinfo->ERP_enable) && (pmlmeinfo->ERP_IE &BIT (1 ))) { +if (pmlmeinfo->ERP_enable && (pmlmeinfo->ERP_IE &BIT (1 ))) {
Same.
drivers/staging/rtl8723bs/core/rtw_wlan_util.c line 171
Quoted 9 lines
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1
-1if (pregpriv->vcs_type ==1 ) { psta->rtsen =1 ; psta->cts2self =0 ;@@ -168,13 +168,13 @@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 ); -if (pbuf && (wpa_ielen >0 )) { +if (pbuf && wpa_ielen >0 ) {
No. Don't do this.
drivers/staging/rtl8723bs/core/rtw_wlan_util.c int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) · line 1222
Quoted 7 lines
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1
-1rtw_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 ); -if (pbuf && (wpa_ielen >0 )) +if (pbuf && wpa_ielen >0 )
No. Don't do this.
Quoted 4 lines
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +0
-0rtw_parse_wpa2_ie (pbuf, wpa_ielen +2 , &group_cipher, &pairwise_cipher, &is_8021x); }
drivers/staging/rtl8723bs/core/rtw_wlan_util.c line 189
Quoted 10 lines
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +5
-2@@ -182,8 +182,11 @@ 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 ) {
This seems unrelated to parentheses. Do it another patch.
drivers/staging/rtl8723bs/core/rtw_wlan_util.c line 234
Quoted 9 lines
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1
-1pmlmepriv->timeBcnInfoChkStart =0 ; pmlmepriv->NumOfBcnInfoChkFail =0 ;return _FAIL;@@ -228,7 +231,7 @@struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;unsigned char *rate = cur_network->supported_rates; -if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable)) +if (pmlmeinfo->HT_info_enable && pmlmeinfo->HT_caps_enable)
Good but do it in another patch.
Quoted 5 lines
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +0
-0pmlmeinfo->HT_enable =1 ;if (pmlmeinfo->HT_enable)done.
regards,
dan carpenter
PATCH v5 1/1 staging: rtl8723bs: remove unnecessary parentheses
In reply to Eugene MavickRemove unnecessary parantheses around &(foo->bar) type statements to improve code readability
Signed-off-by Eugene Mavick <[email protected]>
---
V1->V2:
Fixed following checkpatch warnings on modified lines:
CHECK: Alignment should match open parenthesis(line 1114, 1249)
CHECK: Logical continuations should be on the previous line(line 1251)
V2->V3:
Removed comparison-statement-parentheses-removals(CSPR) per Dan Carpenter's review:
https://lore.kernel.org/all/[email protected]/
V3->V4:
Removed overlooked CSPR;
Removed misleading fixed-warning-example in commit message suggesting CSPR were still present
V4-V5:
Remove none &(foo->bar) type statement parantheses removal
v1: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
.../staging/rtl8723bs/core/rtw_wlan_util.c | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-)
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +35 -35
@@ -351,7 +351,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 ))return true;
@@ -362,7 +362,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 ))return true;
@@ -374,7 +374,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 )
@@ -477,7 +477,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); }
@@ -629,7 +629,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 ) {
@@ -645,7 +645,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 */
@@ -657,19 +657,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; -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;
@@ -709,7 +709,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;
@@ -810,9 +810,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 ;
@@ -867,7 +867,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); */
@@ -897,7 +897,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;
@@ -960,7 +960,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;
@@ -974,7 +974,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)
@@ -983,7 +983,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 ;
@@ -1010,20 +1010,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 */
@@ -1078,7 +1078,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 ;
@@ -1244,7 +1244,7 @@ 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 )) { + && pmlmepriv->NumOfBcnInfoChkFail >=DISCONNECT_BY_CHK_BCN_FAIL_THRESHOLD ) { pmlmepriv->timeBcnInfoChkStart =0 ; pmlmepriv->NumOfBcnInfoChkFail =0 ;return _FAIL;
@@ -1296,8 +1296,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;) {
@@ -1332,7 +1332,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;
@@ -1438,7 +1438,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 :
@@ -1468,7 +1468,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. */
@@ -1520,8 +1520,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))
@@ -1544,7 +1544,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 );
@@ -1569,8 +1569,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 support_rate_num =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)
@@ -1596,7 +1596,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);
@@ -1639,7 +1639,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.51.2
Quoted 5 lines · Eugene Mavick
Remove unnecessary parantheses around &(foo->bar) type statements to improve code readability
Signed-off-by Eugene Mavick <[email protected]>---
From my perspective I'm seeing this patch twice in a day... Just wait a bit... Remove this part as well.
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->NumOfBcnInfoChkFail >= DISCONNECT_BY_CHK_BCN_FAIL_THRESHOLD) {
pmlmepriv->timeBcnInfoChkStart = 0;
pmlmepriv->NumOfBcnInfoChkFail = 0;
return _FAIL;regards,
dan carpenter
PATCH v6 1/1 staging: rtl8723bs: remove unnecessary parentheses
In reply to Eugene MavickRemove unnecessary parantheses around &(foo->bar) type statements to improve code readability
Signed-off-by Eugene Mavick <[email protected]>
---
V1->V2:
Fixed following checkpatch warnings on modified lines:
CHECK: Alignment should match open parenthesis(line 1114, 1249)
CHECK: Logical continuations should be on the previous line(line 1251)
V2->V3:
Removed comparison-statement-parentheses-removals(CSPR) per Dan Carpenter's review:
https://lore.kernel.org/all/[email protected]/
V3->V4:
Removed overlooked CSPR;
Removed misleading fixed-warning-example in commit message suggesting CSPR were still present
V4->V5:
Remove none &(foo->bar) type statement parantheses removal
V5->V6:
Remove overlooked none &(foo->bar) type statement parantheses removal
v1: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[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
@@ -351,7 +351,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 ))return true;
@@ -362,7 +362,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 ))return true;
@@ -374,7 +374,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 )
@@ -477,7 +477,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); }
@@ -629,7 +629,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 ) {
@@ -645,7 +645,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 */
@@ -657,19 +657,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; -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;
@@ -709,7 +709,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;
@@ -810,9 +810,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 ;
@@ -867,7 +867,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); */
@@ -897,7 +897,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;
@@ -960,7 +960,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;
@@ -974,7 +974,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)
@@ -983,7 +983,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 ;
@@ -1010,20 +1010,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 */
@@ -1078,7 +1078,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 ;
@@ -1296,8 +1296,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;) {
@@ -1332,7 +1332,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;
@@ -1438,7 +1438,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 :
@@ -1468,7 +1468,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. */
@@ -1520,8 +1520,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))
@@ -1544,7 +1544,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 );
@@ -1569,8 +1569,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 support_rate_num =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)
@@ -1596,7 +1596,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);
@@ -1639,7 +1639,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.51.2