staging: rtl8723bs: clean up lines ending with '(' in rtw_ap.c
PATCH 1/4 staging: rtl8723bs: clean up lines ending with '(' in rtw_ap.c
This patch fixes coding style issues where lines ended with an opening parenthesis. These expressions were reformatted so that opening parentheses remain on the same line as the statement, with proper alignment of continued arguments.
This is a coding style cleanup only. No functional changes.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 250 +++++++++++------------- 1 file changed, 109 insertions(+), 141 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +109 -141
@@ -480,14 +480,13 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)/* check if sta supports rx ampdu */ phtpriv_sta->ampdu_enable = phtpriv_ap->ampdu_enable; - phtpriv_sta->rx_ampdu_min_spacing = ( - phtpriv_sta->ht_cap.ampdu_params_info &IEEE80211_HT_CAP_AMPDU_DENSITY - ) >>2 ; + phtpriv_sta->rx_ampdu_min_spacing = + (phtpriv_sta->ht_cap.ampdu_params_info & +IEEE80211_HT_CAP_AMPDU_DENSITY ) >>2 ;/* bwmode */ -if (( - phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info - ) &cpu_to_le16 (IEEE80211_HT_CAP_SUP_WIDTH )) +if ((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info) & +cpu_to_le16 (IEEE80211_HT_CAP_SUP_WIDTH )) psta->bw_mode =CHANNEL_WIDTH_40 ;else psta->bw_mode =CHANNEL_WIDTH_20 ;
@@ -498,15 +497,13 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta) phtpriv_sta->ch_offset = pmlmeext->cur_ch_offset;/* check if sta support s Short GI 20M */ -if (( - phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info - ) &cpu_to_le16 (IEEE80211_HT_CAP_SGI_20 )) +if ((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info) & +cpu_to_le16 (IEEE80211_HT_CAP_SGI_20 )) phtpriv_sta->sgi_20m = true;/* check if sta support s Short GI 40M */ -if (( - phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info - ) &cpu_to_le16 (IEEE80211_HT_CAP_SGI_40 )) { +if ((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info) & +cpu_to_le16 (IEEE80211_HT_CAP_SGI_40 )) {if (psta->bw_mode ==CHANNEL_WIDTH_40 )/* according to psta->bw_mode */ phtpriv_sta->sgi_40m = true;else
@@ -625,8 +622,7 @@ static void update_hw_ht_param(struct adapter *padapter)/* */ /* Config SM Power Save setting */ /* */ - pmlmeinfo->SM_PS = (le16_to_cpu ( - pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info + pmlmeinfo->SM_PS = (le16_to_cpu (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info ) &0x0C ) >>2 ;/* */
@@ -705,8 +701,7 @@ void start_bss_network(struct adapter *padapter)rtw_hal_set_hwreg (padapter,HW_VAR_AC_PARAM_BK , (u8 *)(&acparm));/* Set Security */ - val8 = ( - psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X + val8 = (psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X ) ?0xcc :0xcf ;rtw_hal_set_hwreg (padapter,HW_VAR_SEC_CFG , (u8 *)(&val8));
@@ -782,9 +777,8 @@ void start_bss_network(struct adapter *padapter)rtw_hal_set_hwreg (padapter,HW_VAR_BASIC_RATE , pnetwork->supported_rates);/* update capability after cur_wireless_mode updated */ -update_capinfo ( - padapter, -rtw_get_capability ((struct wlan_bssid_ex *)pnetwork) +update_capinfo (padapter, +rtw_get_capability ((struct wlan_bssid_ex *)pnetwork) );if (pmlmeext->bstart_bss) {
@@ -851,11 +845,10 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) cap =get_unaligned_le16 (ie);/* SSID */ - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_SSID , - &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_SSID , + &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_) );if (p && ie_len >0 ) {memset (&pbss_network->ssid,0 ,sizeof (struct ndis_802_11_ssid ));
@@ -866,10 +859,9 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)/* channel */ channel =0 ; pbss_network->configuration.length =0 ; - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_DS_PARAMS , &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_DS_PARAMS , &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_) );if (p && ie_len >0 ) channel = *(p +2 );
@@ -878,11 +870,10 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)memset (supportRate,0 ,NDIS_802_11_LENGTH_RATES_EX );/* get supported rates */ - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_SUPP_RATES , - &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_SUPP_RATES , + &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_) );if (p) {memcpy (supportRate, p +2 , ie_len);
@@ -890,11 +881,10 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) }/* get ext_supported rates */ - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_EXT_SUPP_RATES , - &ie_len, - pbss_network->ie_length - _BEACON_IE_OFFSET_ + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_EXT_SUPP_RATES , + &ie_len, + pbss_network->ie_length - _BEACON_IE_OFFSET_ );if (p) {memcpy (supportRate + supportRateNum, p +2 , ie_len);
@@ -906,11 +896,10 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)rtw_set_supported_rate (pbss_network->supported_rates, network_type);/* parsing ERP_IE */ - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_ERP_INFO , - &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_ERP_INFO , + &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_) );if (p && ie_len >0 )ERP_IE_handler (padapter, (struct ndis_80211_var_ie *)p);
@@ -927,19 +916,17 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) group_cipher =0 ; pairwise_cipher =0 ; psecuritypriv->wpa2_group_cipher = _NO_PRIVACY_; psecuritypriv->wpa2_pairwise_cipher = _NO_PRIVACY_; - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_RSN , - &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_RSN , + &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_) );if (p && ie_len >0 ) { -if (rtw_parse_wpa2_ie ( - p, - ie_len +2 , - &group_cipher, - &pairwise_cipher, -NULL +if (rtw_parse_wpa2_ie (p, + ie_len +2 , + &group_cipher, + &pairwise_cipher, +NULL ) == _SUCCESS) { psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X;
@@ -957,19 +944,17 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) psecuritypriv->wpa_group_cipher = _NO_PRIVACY_; psecuritypriv->wpa_pairwise_cipher = _NO_PRIVACY_;for (p = ie + _BEACON_IE_OFFSET_; ; p += (ie_len +2 )) { - p =rtw_get_ie ( - p, -WLAN_EID_VENDOR_SPECIFIC , - &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_ - (ie_len +2 )) + p =rtw_get_ie (p, +WLAN_EID_VENDOR_SPECIFIC , + &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_ - (ie_len +2 )) );if ((p) && (!memcmp (p +2 ,OUI1 ,4 ))) { -if (rtw_parse_wpa_ie ( - p, - ie_len +2 , - &group_cipher, - &pairwise_cipher, -NULL +if (rtw_parse_wpa_ie (p, + ie_len +2 , + &group_cipher, + &pairwise_cipher, +NULL ) == _SUCCESS) { psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X;
@@ -993,11 +978,10 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) pmlmepriv->qospriv.qos_option =0 ;if (pregistrypriv->wmm_enable) {for (p = ie + _BEACON_IE_OFFSET_; ; p += (ie_len +2 )) { - p =rtw_get_ie ( - p, -WLAN_EID_VENDOR_SPECIFIC , - &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_ - (ie_len +2 )) + p =rtw_get_ie (p, +WLAN_EID_VENDOR_SPECIFIC , + &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_ - (ie_len +2 )) );if ((p) && !memcmp (p +2 ,WMM_PARA_IE ,6 )) { pmlmepriv->qospriv.qos_option =1 ;
@@ -1020,11 +1004,10 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) }/* parsing HT_CAP_IE */ - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_HT_CAPABILITY , - &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_HT_CAPABILITY , + &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_) );if (p && ie_len >0 ) {u8 max_rx_ampdu_factor =0 ;
@@ -1052,8 +1035,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)if (!TEST_FLAG (pmlmepriv->htpriv.stbc_cap,STBC_HT_ENABLE_RX )) pht_cap->cap_info &=cpu_to_le16 (~(IEEE80211_HT_CAP_RX_STBC_3R )); - pht_cap->ampdu_params_info &= ~( -IEEE80211_HT_CAP_AMPDU_FACTOR |IEEE80211_HT_CAP_AMPDU_DENSITY + pht_cap->ampdu_params_info &= ~(IEEE80211_HT_CAP_AMPDU_FACTOR | +IEEE80211_HT_CAP_AMPDU_DENSITY ); if ((psecuritypriv->wpa_pairwise_cipher & WPA_CIPHER_CCMP) ||
@@ -1065,13 +1048,12 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 0x00); } -rtw_hal_get_def_var ( - padapter, -HW_VAR_MAX_RX_AMPDU_FACTOR , - &max_rx_ampdu_factor +rtw_hal_get_def_var (padapter, +HW_VAR_MAX_RX_AMPDU_FACTOR , + &max_rx_ampdu_factor ); - pht_cap->ampdu_params_info |= ( -IEEE80211_HT_CAP_AMPDU_FACTOR & max_rx_ampdu_factor + pht_cap->ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_FACTOR & + max_rx_ampdu_factor );/* set Max Rx AMPDU size to 64K */ pht_cap->mcs.rx_mask[0 ] =0xff ;
@@ -1081,11 +1063,10 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) }/* parsing HT_INFO_IE */ - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_HT_OPERATION , - &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_HT_OPERATION , + &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_) );if (p && ie_len >0 ) pHT_info_ie = p;
@@ -1128,8 +1109,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)HT_info_handler (padapter, (struct ndis_80211_var_ie *)pHT_info_ie); } - pbss_network->length =get_wlan_bssid_ex_sz ( - (struct wlan_bssid_ex *)pbss_network + pbss_network->length =get_wlan_bssid_ex_sz ((struct wlan_bssid_ex *)pbss_network );/* issue beacon to start bss network */
@@ -1237,9 +1217,8 @@ void rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)list_for_each_safe (plist, tmp, phead) { paclnode = list_entry(plist, struct rtw_wlan_acl_node, list); -if ( - !memcmp (paclnode->addr, addr,ETH_ALEN ) || -is_broadcast_ether_addr (addr) +if (!memcmp (paclnode->addr, addr,ETH_ALEN ) || +is_broadcast_ether_addr (addr) ) {if (paclnode->valid) { paclnode->valid = false;
@@ -1290,12 +1269,11 @@ u8 rtw_ap_set_pairwise_key(struct adapter *padapter, struct sta_info *psta)return res; } -static int rtw_ap_set_key ( -struct adapter *padapter, -u8 *key, -u8 alg, -int keyid, -u8 set_tx +static int rtw_ap_set_key (struct adapter *padapter, +u8 *key, +u8 alg, +int keyid, +u8 set_tx ) {u8 keylen;
@@ -1360,12 +1338,11 @@ int rtw_ap_set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid)return rtw_ap_set_key (padapter, key, alg, keyid,1 ); } -int rtw_ap_set_wep_key ( -struct adapter *padapter, -u8 *key, -u8 keylen, -int keyid, -u8 set_tx +int rtw_ap_set_wep_key (struct adapter *padapter, +u8 *key, +u8 keylen, +int keyid, +u8 set_tx ) {u8 alg;
@@ -1401,11 +1378,10 @@ static void update_bcn_erpinfo_ie(struct adapter *padapter)return ;/* parsing ERP_IE */ - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_ERP_INFO , - &len, - (pnetwork->ie_length - _BEACON_IE_OFFSET_) + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_ERP_INFO , + &len, + (pnetwork->ie_length - _BEACON_IE_OFFSET_) );if (p && len >0 ) {struct ndis_80211_var_ie *pIE = (struct ndis_80211_var_ie *)p;
@@ -1413,9 +1389,8 @@ static void update_bcn_erpinfo_ie(struct adapter *padapter)if (pmlmepriv->num_sta_non_erp ==1 ) pIE->data[0 ] |=RTW_ERP_INFO_NON_ERP_PRESENT |RTW_ERP_INFO_USE_PROTECTION ;else - pIE->data[0 ] &= ~( -RTW_ERP_INFO_NON_ERP_PRESENT |RTW_ERP_INFO_USE_PROTECTION - ); + pIE->data[0 ] &= ~(RTW_ERP_INFO_NON_ERP_PRESENT | +RTW_ERP_INFO_USE_PROTECTION );if (pmlmepriv->num_sta_no_short_preamble >0 ) pIE->data[0 ] |=RTW_ERP_INFO_BARKER_PREAMBLE_MODE ;
@@ -1461,11 +1436,10 @@ static void update_bcn_wps_ie(struct adapter *padapter)unsigned char *ie = pnetwork->ies;u32 ielen = pnetwork->ie_length; - pwps_ie =rtw_get_wps_ie ( - ie + _FIXED_IE_LENGTH_, - ielen - _FIXED_IE_LENGTH_, -NULL , - &wps_ielen + pwps_ie =rtw_get_wps_ie (ie + _FIXED_IE_LENGTH_, + ielen - _FIXED_IE_LENGTH_, +NULL , + &wps_ielen );if (!pwps_ie || wps_ielen ==0 )
@@ -1651,8 +1625,7 @@ static int rtw_ht_operation_update(struct adapter *padapter)if (pmlmepriv->num_sta_no_ht || (pmlmepriv->ht_op_mode &IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT )) new_op_mode =IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED ; -else if ( - (le16_to_cpu (phtpriv_ap->ht_cap.cap_info) &IEEE80211_HT_CAP_SUP_WIDTH ) +else if ((le16_to_cpu (phtpriv_ap->ht_cap.cap_info) &IEEE80211_HT_CAP_SUP_WIDTH ) && pmlmepriv->num_sta_ht_20mhz) new_op_mode =IEEE80211_HT_OP_MODE_PROTECTION_20MHZ ;else if (pmlmepriv->olbc_ht)
@@ -1874,11 +1847,10 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta)return beacon_updated; } -u8 ap_free_sta ( -struct adapter *padapter, -struct sta_info *psta, -bool active, -u16 reason +u8 ap_free_sta (struct adapter *padapter, +struct sta_info *psta, +bool active, +u16 reason ) {u8 beacon_updated = false;
@@ -2007,11 +1979,10 @@ void rtw_ap_restore_network(struct adapter *padapter)rtw_setopmode_cmd (padapter, Ndis802_11APMode, false); -set_channel_bwmode ( - padapter, - pmlmeext->cur_channel, - pmlmeext->cur_ch_offset, - pmlmeext->cur_bwmode +set_channel_bwmode (padapter, + pmlmeext->cur_channel, + pmlmeext->cur_ch_offset, + pmlmeext->cur_bwmode );start_bss_network (padapter);
@@ -2019,12 +1990,11 @@ void rtw_ap_restore_network(struct adapter *padapter)if ((padapter->securitypriv.dot11PrivacyAlgrthm == _TKIP_) || (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_)) {/* restore group key, WEP keys is restored in ips_leave() */ -rtw_set_key ( - padapter, - psecuritypriv, - psecuritypriv->dot118021XGrpKeyid, -0 , - false +rtw_set_key (padapter, + psecuritypriv, + psecuritypriv->dot118021XGrpKeyid, +0 , + false ); }
@@ -2126,11 +2096,9 @@ void stop_ap_mode(struct adapter *padapter) pmlmeext->bstart_bss = false;/* reset and init security priv , this can refine with rtw_reset_securitypriv */ -memset ( - (unsigned char *)&padapter->securitypriv, -0 , -sizeof (struct security_priv ) - ); +memset ((unsigned char *)&padapter->securitypriv, +0 , +sizeof (struct security_priv )); padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen; padapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled;
Signature · 1 line
2.50.1
PATCH 1/1 staging: rtl8723bs: clean up style in rtw_ap.c
This patch fixes several coding style issues reported by checkpatch.pl in rtw_ap.c. Changes include:
- Removed cases where lines ended with an opening parenthesis
- Broke long comments exceeding 100 characters
- Fixed alignment in multi-line function calls
These are coding style cleanups only. No functional changes.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 270 +++++++++++------------- 1 file changed, 123 insertions(+), 147 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +123 -147
@@ -391,7 +391,9 @@ void update_bmc_sta(struct adapter *padapter)memset ((void *)&psta->sta_stats,0 ,sizeof (struct stainfo_stats )); -/* psta->dot118021XPrivacy = _NO_PRIVACY_;//!!! remove it, because it has been set before this. */ +/* psta->dot118021XPrivacy = _NO_PRIVACY_; +* remove it, because it has been set before this. +*/ /* prepare for add_RATid */ supportRateNum =rtw_get_rateset_len ((u8 *)&pcur_network->supported_rates);
@@ -436,7 +438,6 @@ void update_bmc_sta(struct adapter *padapter)spin_lock_bh (&psta->lock); psta->state = _FW_LINKED;spin_unlock_bh (&psta->lock); - } }
@@ -480,14 +481,13 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)/* check if sta supports rx ampdu */ phtpriv_sta->ampdu_enable = phtpriv_ap->ampdu_enable; - phtpriv_sta->rx_ampdu_min_spacing = ( - phtpriv_sta->ht_cap.ampdu_params_info &IEEE80211_HT_CAP_AMPDU_DENSITY + phtpriv_sta->rx_ampdu_min_spacing = (phtpriv_sta->ht_cap.ampdu_params_info & +IEEE80211_HT_CAP_AMPDU_DENSITY ) >>2 ;/* bwmode */ -if (( - phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info - ) &cpu_to_le16 (IEEE80211_HT_CAP_SUP_WIDTH )) +if ((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info) & +cpu_to_le16 (IEEE80211_HT_CAP_SUP_WIDTH )) psta->bw_mode =CHANNEL_WIDTH_40 ;else psta->bw_mode =CHANNEL_WIDTH_20 ;
@@ -498,15 +498,13 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta) phtpriv_sta->ch_offset = pmlmeext->cur_ch_offset;/* check if sta support s Short GI 20M */ -if (( - phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info - ) &cpu_to_le16 (IEEE80211_HT_CAP_SGI_20 )) +if ((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info) & +cpu_to_le16 (IEEE80211_HT_CAP_SGI_20 )) phtpriv_sta->sgi_20m = true;/* check if sta support s Short GI 40M */ -if (( - phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info - ) &cpu_to_le16 (IEEE80211_HT_CAP_SGI_40 )) { +if ((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info) & +cpu_to_le16 (IEEE80211_HT_CAP_SGI_40 )) {if (psta->bw_mode ==CHANNEL_WIDTH_40 )/* according to psta->bw_mode */ phtpriv_sta->sgi_40m = true;else
@@ -625,8 +623,7 @@ static void update_hw_ht_param(struct adapter *padapter)/* */ /* Config SM Power Save setting */ /* */ - pmlmeinfo->SM_PS = (le16_to_cpu ( - pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info + pmlmeinfo->SM_PS = (le16_to_cpu (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info ) &0x0C ) >>2 ;/* */
@@ -659,7 +656,10 @@ void start_bss_network(struct adapter *padapter) cur_ch_offset =HAL_PRIME_CHNL_OFFSET_DONT_CARE ;/* check if there is wps ie, */ -/* if there is wpsie in beacon, the hostapd will update beacon twice when stating hostapd, */ +/* if there is wpsie in beacon, +*the hostapd will update beacon +*twice when stating hostapd, +*/ /* and at first time the security ie (RSN/WPA IE) will not include in beacon. */ if (!rtw_get_wps_ie (pnetwork->ies + _FIXED_IE_LENGTH_, pnetwork->ie_length - _FIXED_IE_LENGTH_,NULL ,NULL ))
@@ -705,8 +705,7 @@ void start_bss_network(struct adapter *padapter)rtw_hal_set_hwreg (padapter,HW_VAR_AC_PARAM_BK , (u8 *)(&acparm));/* Set Security */ - val8 = ( - psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X + val8 = (psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X ) ?0xcc :0xcf ;rtw_hal_set_hwreg (padapter,HW_VAR_SEC_CFG , (u8 *)(&val8));
@@ -782,9 +781,8 @@ void start_bss_network(struct adapter *padapter)rtw_hal_set_hwreg (padapter,HW_VAR_BASIC_RATE , pnetwork->supported_rates);/* update capability after cur_wireless_mode updated */ -update_capinfo ( - padapter, -rtw_get_capability ((struct wlan_bssid_ex *)pnetwork) +update_capinfo (padapter, +rtw_get_capability ((struct wlan_bssid_ex *)pnetwork) );if (pmlmeext->bstart_bss) {
@@ -841,7 +839,10 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)memcpy (pbss_network->mac_address,myid (&padapter->eeprompriv),ETH_ALEN );/* beacon interval */ - p =rtw_get_beacon_interval_from_ie (ie);/* ie + 8; 8: TimeStamp, 2: Beacon Interval 2:Capability */ + p =rtw_get_beacon_interval_from_ie (ie); +/* ie + 8; +* 8: TimeStamp, 2: Beacon Interval 2:Capability +*/ /* pbss_network->configuration.beacon_period = le16_to_cpu(*(unsigned short*)p); */ pbss_network->configuration.beacon_period =get_unaligned_le16 (p);
@@ -851,11 +852,10 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) cap =get_unaligned_le16 (ie);/* SSID */ - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_SSID , - &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_SSID , + &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_) );if (p && ie_len >0 ) {memset (&pbss_network->ssid,0 ,sizeof (struct ndis_802_11_ssid ));
@@ -866,10 +866,9 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)/* channel */ channel =0 ; pbss_network->configuration.length =0 ; - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_DS_PARAMS , &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_DS_PARAMS , &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_) );if (p && ie_len >0 ) channel = *(p +2 );
@@ -878,11 +877,10 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)memset (supportRate,0 ,NDIS_802_11_LENGTH_RATES_EX );/* get supported rates */ - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_SUPP_RATES , - &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_SUPP_RATES , + &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_) );if (p) {memcpy (supportRate, p +2 , ie_len);
@@ -890,11 +888,10 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) }/* get ext_supported rates */ - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_EXT_SUPP_RATES , - &ie_len, - pbss_network->ie_length - _BEACON_IE_OFFSET_ + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_EXT_SUPP_RATES , + &ie_len, + pbss_network->ie_length - _BEACON_IE_OFFSET_ );if (p) {memcpy (supportRate + supportRateNum, p +2 , ie_len);
@@ -906,11 +903,10 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)rtw_set_supported_rate (pbss_network->supported_rates, network_type);/* parsing ERP_IE */ - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_ERP_INFO , - &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_ERP_INFO , + &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_) );if (p && ie_len >0 )ERP_IE_handler (padapter, (struct ndis_80211_var_ie *)p);
@@ -927,19 +923,17 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) group_cipher =0 ; pairwise_cipher =0 ; psecuritypriv->wpa2_group_cipher = _NO_PRIVACY_; psecuritypriv->wpa2_pairwise_cipher = _NO_PRIVACY_; - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_RSN , - &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_RSN , + &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_) );if (p && ie_len >0 ) { -if (rtw_parse_wpa2_ie ( - p, - ie_len +2 , - &group_cipher, - &pairwise_cipher, -NULL +if (rtw_parse_wpa2_ie (p, + ie_len +2 , + &group_cipher, + &pairwise_cipher, +NULL ) == _SUCCESS) { psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X;
@@ -957,19 +951,17 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) psecuritypriv->wpa_group_cipher = _NO_PRIVACY_; psecuritypriv->wpa_pairwise_cipher = _NO_PRIVACY_;for (p = ie + _BEACON_IE_OFFSET_; ; p += (ie_len +2 )) { - p =rtw_get_ie ( - p, -WLAN_EID_VENDOR_SPECIFIC , - &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_ - (ie_len +2 )) + p =rtw_get_ie (p, +WLAN_EID_VENDOR_SPECIFIC , + &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_ - (ie_len +2 )) );if ((p) && (!memcmp (p +2 ,OUI1 ,4 ))) { -if (rtw_parse_wpa_ie ( - p, - ie_len +2 , - &group_cipher, - &pairwise_cipher, -NULL +if (rtw_parse_wpa_ie (p, + ie_len +2 , + &group_cipher, + &pairwise_cipher, +NULL ) == _SUCCESS) { psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X;
@@ -993,11 +985,10 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) pmlmepriv->qospriv.qos_option =0 ;if (pregistrypriv->wmm_enable) {for (p = ie + _BEACON_IE_OFFSET_; ; p += (ie_len +2 )) { - p =rtw_get_ie ( - p, -WLAN_EID_VENDOR_SPECIFIC , - &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_ - (ie_len +2 )) + p =rtw_get_ie (p, +WLAN_EID_VENDOR_SPECIFIC , + &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_ - (ie_len +2 )) );if ((p) && !memcmp (p +2 ,WMM_PARA_IE ,6 )) { pmlmepriv->qospriv.qos_option =1 ;
@@ -1020,11 +1011,10 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) }/* parsing HT_CAP_IE */ - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_HT_CAPABILITY , - &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_HT_CAPABILITY , + &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_) );if (p && ie_len >0 ) {u8 max_rx_ampdu_factor =0 ;
@@ -1052,8 +1042,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)if (!TEST_FLAG (pmlmepriv->htpriv.stbc_cap,STBC_HT_ENABLE_RX )) pht_cap->cap_info &=cpu_to_le16 (~(IEEE80211_HT_CAP_RX_STBC_3R )); - pht_cap->ampdu_params_info &= ~( -IEEE80211_HT_CAP_AMPDU_FACTOR |IEEE80211_HT_CAP_AMPDU_DENSITY + pht_cap->ampdu_params_info &= ~(IEEE80211_HT_CAP_AMPDU_FACTOR | +IEEE80211_HT_CAP_AMPDU_DENSITY ); if ((psecuritypriv->wpa_pairwise_cipher & WPA_CIPHER_CCMP) ||
@@ -1065,13 +1055,12 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 0x00); } -rtw_hal_get_def_var ( - padapter, -HW_VAR_MAX_RX_AMPDU_FACTOR , - &max_rx_ampdu_factor +rtw_hal_get_def_var (padapter, +HW_VAR_MAX_RX_AMPDU_FACTOR , + &max_rx_ampdu_factor ); - pht_cap->ampdu_params_info |= ( -IEEE80211_HT_CAP_AMPDU_FACTOR & max_rx_ampdu_factor + pht_cap->ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_FACTOR & + max_rx_ampdu_factor );/* set Max Rx AMPDU size to 64K */ pht_cap->mcs.rx_mask[0 ] =0xff ;
@@ -1081,11 +1070,10 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) }/* parsing HT_INFO_IE */ - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_HT_OPERATION , - &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_HT_OPERATION , + &ie_len, + (pbss_network->ie_length - _BEACON_IE_OFFSET_) );if (p && ie_len >0 ) pHT_info_ie = p;
@@ -1128,8 +1116,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)HT_info_handler (padapter, (struct ndis_80211_var_ie *)pHT_info_ie); } - pbss_network->length =get_wlan_bssid_ex_sz ( - (struct wlan_bssid_ex *)pbss_network + pbss_network->length =get_wlan_bssid_ex_sz ((struct wlan_bssid_ex *)pbss_network );/* issue beacon to start bss network */
@@ -1147,7 +1134,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)/* update AP's sta info */ update_ap_info (padapter, psta); - psta->state |=WIFI_AP_STATE ;/* Aries, add, fix bug of flush_cam_entry at STOP AP mode , 0724 */ + psta->state |=WIFI_AP_STATE ; +/* Aries, add, fix bug of flush_cam_entry at STOP AP mode , 0724 */ rtw_indicate_connect (padapter); pmlmepriv->cur_network.join_res = true;/* for check if already set beacon */
@@ -1237,9 +1225,8 @@ void rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)list_for_each_safe (plist, tmp, phead) { paclnode = list_entry(plist, struct rtw_wlan_acl_node, list); -if ( - !memcmp (paclnode->addr, addr,ETH_ALEN ) || -is_broadcast_ether_addr (addr) +if (!memcmp (paclnode->addr, addr,ETH_ALEN ) || +is_broadcast_ether_addr (addr) ) {if (paclnode->valid) { paclnode->valid = false;
@@ -1252,7 +1239,6 @@ void rtw_acl_remove_sta(struct adapter *padapter, u8 *addr) }spin_unlock_bh (&pacl_node_q->lock); - }u8 rtw_ap_set_pairwise_key (struct adapter *padapter,struct sta_info *psta)
@@ -1290,12 +1276,11 @@ u8 rtw_ap_set_pairwise_key(struct adapter *padapter, struct sta_info *psta)return res; } -static int rtw_ap_set_key ( -struct adapter *padapter, -u8 *key, -u8 alg, -int keyid, -u8 set_tx +static int rtw_ap_set_key (struct adapter *padapter, +u8 *key, +u8 alg, +int keyid, +u8 set_tx ) {u8 keylen;
@@ -1360,12 +1345,11 @@ int rtw_ap_set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid)return rtw_ap_set_key (padapter, key, alg, keyid,1 ); } -int rtw_ap_set_wep_key ( -struct adapter *padapter, -u8 *key, -u8 keylen, -int keyid, -u8 set_tx +int rtw_ap_set_wep_key (struct adapter *padapter, +u8 *key, +u8 keylen, +int keyid, +u8 set_tx ) {u8 alg;
@@ -1401,11 +1385,10 @@ static void update_bcn_erpinfo_ie(struct adapter *padapter)return ;/* parsing ERP_IE */ - p =rtw_get_ie ( - ie + _BEACON_IE_OFFSET_, -WLAN_EID_ERP_INFO , - &len, - (pnetwork->ie_length - _BEACON_IE_OFFSET_) + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_ERP_INFO , + &len, + (pnetwork->ie_length - _BEACON_IE_OFFSET_) );if (p && len >0 ) {struct ndis_80211_var_ie *pIE = (struct ndis_80211_var_ie *)p;
@@ -1413,9 +1396,8 @@ static void update_bcn_erpinfo_ie(struct adapter *padapter)if (pmlmepriv->num_sta_non_erp ==1 ) pIE->data[0 ] |=RTW_ERP_INFO_NON_ERP_PRESENT |RTW_ERP_INFO_USE_PROTECTION ;else - pIE->data[0 ] &= ~( -RTW_ERP_INFO_NON_ERP_PRESENT |RTW_ERP_INFO_USE_PROTECTION - ); + pIE->data[0 ] &= ~(RTW_ERP_INFO_NON_ERP_PRESENT | +RTW_ERP_INFO_USE_PROTECTION );if (pmlmepriv->num_sta_no_short_preamble >0 ) pIE->data[0 ] |=RTW_ERP_INFO_BARKER_PREAMBLE_MODE ;
@@ -1461,11 +1443,10 @@ static void update_bcn_wps_ie(struct adapter *padapter)unsigned char *ie = pnetwork->ies;u32 ielen = pnetwork->ie_length; - pwps_ie =rtw_get_wps_ie ( - ie + _FIXED_IE_LENGTH_, - ielen - _FIXED_IE_LENGTH_, -NULL , - &wps_ielen + pwps_ie =rtw_get_wps_ie (ie + _FIXED_IE_LENGTH_, + ielen - _FIXED_IE_LENGTH_, +NULL , + &wps_ielen );if (!pwps_ie || wps_ielen ==0 )
@@ -1490,7 +1471,7 @@ static void update_bcn_wps_ie(struct adapter *padapter) wps_ielen = (uint )pwps_ie_src[1 ];/* to get ie data len */ if ((wps_offset + wps_ielen +2 + remainder_ielen) <=MAX_IE_SZ ) {memcpy (pwps_ie, pwps_ie_src, wps_ielen +2 ); - pwps_ie += (wps_ielen+2 ); + pwps_ie += (wps_ielen +2 );if (pbackup_remainder_ie)memcpy (pwps_ie, pbackup_remainder_ie, remainder_ielen);
@@ -1651,8 +1632,7 @@ static int rtw_ht_operation_update(struct adapter *padapter)if (pmlmepriv->num_sta_no_ht || (pmlmepriv->ht_op_mode &IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT )) new_op_mode =IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED ; -else if ( - (le16_to_cpu (phtpriv_ap->ht_cap.cap_info) &IEEE80211_HT_CAP_SUP_WIDTH ) +else if ((le16_to_cpu (phtpriv_ap->ht_cap.cap_info) &IEEE80211_HT_CAP_SUP_WIDTH ) && pmlmepriv->num_sta_ht_20mhz) new_op_mode =IEEE80211_HT_OP_MODE_PROTECTION_20MHZ ;else if (pmlmepriv->olbc_ht)
@@ -1874,11 +1854,10 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta)return beacon_updated; } -u8 ap_free_sta ( -struct adapter *padapter, -struct sta_info *psta, -bool active, -u16 reason +u8 ap_free_sta (struct adapter *padapter, +struct sta_info *psta, +bool active, +u16 reason ) {u8 beacon_updated = false;
@@ -1993,6 +1972,7 @@ void ap_sta_info_defer_update(struct adapter *padapter, struct sta_info *psta)add_RATid (padapter, psta,0 );/* DM_RATR_STA_INIT */ } } +/* restore hw setting from sw data structures */ void rtw_ap_restore_network (struct adapter *padapter) {
@@ -2007,11 +1987,10 @@ void rtw_ap_restore_network(struct adapter *padapter)rtw_setopmode_cmd (padapter, Ndis802_11APMode, false); -set_channel_bwmode ( - padapter, - pmlmeext->cur_channel, - pmlmeext->cur_ch_offset, - pmlmeext->cur_bwmode +set_channel_bwmode (padapter, + pmlmeext->cur_channel, + pmlmeext->cur_ch_offset, + pmlmeext->cur_bwmode );start_bss_network (padapter);
@@ -2019,12 +1998,11 @@ void rtw_ap_restore_network(struct adapter *padapter)if ((padapter->securitypriv.dot11PrivacyAlgrthm == _TKIP_) || (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_)) {/* restore group key, WEP keys is restored in ips_leave() */ -rtw_set_key ( - padapter, - psecuritypriv, - psecuritypriv->dot118021XGrpKeyid, -0 , - false +rtw_set_key (padapter, + psecuritypriv, + psecuritypriv->dot118021XGrpKeyid, +0 , + false ); }
@@ -2126,11 +2104,9 @@ void stop_ap_mode(struct adapter *padapter) pmlmeext->bstart_bss = false;/* reset and init security priv , this can refine with rtw_reset_securitypriv */ -memset ( - (unsigned char *)&padapter->securitypriv, -0 , -sizeof (struct security_priv ) - ); +memset ((unsigned char *)&padapter->securitypriv, +0 , +sizeof (struct security_priv )); padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen; padapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled;
Signature · 1 line
2.50.1
Re: [PATCH] staging: rtl8723bs: clean up style in rtw_ap.c
Quoted 18 lines · Rohan Tripathi
This patch fixes several coding style issues reported by checkpatch.pl in
rtw_ap.c. Changes include:
- Removed cases where lines ended with an opening parenthesis
- Broke long comments exceeding 100 characters
- Fixed alignment in multi-line function callsThese are coding style cleanups only. No functional changes.
Signed-off-by Rohan Tripathi <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_ap.c | 270 +++++++++++------------- 1 file changed, 123 insertions(+), 147 deletions(-)drivers/staging/rtl8723bs/core/rtw_ap.c +0
-0
drivers/staging/rtl8723bs/core/rtw_ap.c void update_bmc_sta(struct adapter *padapter) · line 396
Quoted 7 lines
drivers/staging/rtl8723bs/core/rtw_ap.c +3
-1@@ -391,7 +391,9 @@ void update_bmc_sta(struct adapter *padapter)memset ((void *)&psta->sta_stats,0 ,sizeof (struct stainfo_stats )); -/* psta->dot118021XPrivacy = _NO_PRIVACY_;//!!! remove it, because it has been set before this. */ +/* psta->dot118021XPrivacy = _NO_PRIVACY_; +* remove it, because it has been set before this. +*/
Just delete dead code.
drivers/staging/rtl8723bs/core/rtw_ap.c void update_bmc_sta(struct adapter *padapter) · line 441
Quoted 9 lines
drivers/staging/rtl8723bs/core/rtw_ap.c +0
-1/* prepare for add_RATid */ supportRateNum =rtw_get_rateset_len ((u8 *)&pcur_network->supported_rates);@@ -436,7 +438,6 @@ void update_bmc_sta(struct adapter *padapter)spin_lock_bh (&psta->lock); psta->state = _FW_LINKED;spin_unlock_bh (&psta->lock); - }
This is fine, but it's unrelated to the rest of the patch so it needs to be done as a separate patch.
Quoted 8 lines
drivers/staging/rtl8723bs/core/rtw_ap.c +0
-2}@@ -480,14 +481,13 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)/* check if sta supports rx ampdu */ phtpriv_sta->ampdu_enable = phtpriv_ap->ampdu_enable; - phtpriv_sta->rx_ampdu_min_spacing = ( - phtpriv_sta->ht_cap.ampdu_params_info & IEEE80211_HT_CAP_AMPDU_DENSITY
drivers/staging/rtl8723bs/core/rtw_ap.c void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta) · line 490
Quoted 10 lines
drivers/staging/rtl8723bs/core/rtw_ap.c +4
-3+ phtpriv_sta->rx_ampdu_min_spacing = (phtpriv_sta->ht_cap.ampdu_params_info & +IEEE80211_HT_CAP_AMPDU_DENSITY ) >>2 ;/* bwmode */ -if (( - phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info - ) &cpu_to_le16 (IEEE80211_HT_CAP_SUP_WIDTH )) +if ((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info) & +cpu_to_le16 (IEEE80211_HT_CAP_SUP_WIDTH ))
This isn't aligned correctly. Use a combination of tabs and spaces to make it exact.
Same for all the rest etc.
regards,
dan carpenter
PATCH 2/4 staging: rtl8723bs: split long comments in rtw_ap.c
In reply to Rohan TripathiThis patch splits overly long comments that exceeded 100 characters into multiple shorter lines, following kernel coding style guidelines.
This is a coding style cleanup only. No functional changes.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +13 -4
@@ -391,7 +391,9 @@ void update_bmc_sta(struct adapter *padapter)memset ((void *)&psta->sta_stats,0 ,sizeof (struct stainfo_stats )); -/* psta->dot118021XPrivacy = _NO_PRIVACY_;//!!! remove it, because it has been set before this. */ +/* psta->dot118021XPrivacy = _NO_PRIVACY_; +* remove it, because it has been set before this. +*/ /* prepare for add_RATid */ supportRateNum =rtw_get_rateset_len ((u8 *)&pcur_network->supported_rates);
@@ -655,7 +657,10 @@ void start_bss_network(struct adapter *padapter) cur_ch_offset =HAL_PRIME_CHNL_OFFSET_DONT_CARE ;/* check if there is wps ie, */ -/* if there is wpsie in beacon, the hostapd will update beacon twice when stating hostapd, */ +/* if there is wpsie in beacon, +*the hostapd will update beacon +*twice when stating hostapd, +*/ /* and at first time the security ie (RSN/WPA IE) will not include in beacon. */ if (!rtw_get_wps_ie (pnetwork->ies + _FIXED_IE_LENGTH_, pnetwork->ie_length - _FIXED_IE_LENGTH_,NULL ,NULL ))
@@ -835,7 +840,10 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)memcpy (pbss_network->mac_address,myid (&padapter->eeprompriv),ETH_ALEN );/* beacon interval */ - p =rtw_get_beacon_interval_from_ie (ie);/* ie + 8; 8: TimeStamp, 2: Beacon Interval 2:Capability */ + p =rtw_get_beacon_interval_from_ie (ie); +/* ie + 8; +* 8: TimeStamp, 2: Beacon Interval 2:Capability +*/ /* pbss_network->configuration.beacon_period = le16_to_cpu(*(unsigned short*)p); */ pbss_network->configuration.beacon_period =get_unaligned_le16 (p);
@@ -1127,7 +1135,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)/* update AP's sta info */ update_ap_info (padapter, psta); - psta->state |=WIFI_AP_STATE ;/* Aries, add, fix bug of flush_cam_entry at STOP AP mode , 0724 */ + psta->state |=WIFI_AP_STATE ; +/* Aries, add, fix bug of flush_cam_entry at STOP AP mode , 0724 */ rtw_indicate_connect (padapter); pmlmepriv->cur_network.join_res = true;/* for check if already set beacon */
Signature · 1 line
2.50.1
Re: [PATCH 2/4] staging: rtl8723bs: split long comments in rtw_ap.c
Quoted 26 lines · Rohan Tripathi
This patch splits overly long comments that exceeded 100 characters into multiple shorter lines, following kernel coding style guidelines.
This is a coding style cleanup only. No functional changes.
Signed-off-by Rohan Tripathi <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_ap.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)drivers/staging/rtl8723bs/core/rtw_ap.c +3
-1@@ -391,7 +391,9 @@ void update_bmc_sta(struct adapter *padapter)memset ((void *)&psta->sta_stats,0 ,sizeof (struct stainfo_stats )); -/* psta->dot118021XPrivacy = _NO_PRIVACY_;//!!! remove it, because it has been set before this. */ +/* psta->dot118021XPrivacy = _NO_PRIVACY_; +* remove it, because it has been set before this. +*/ /* prepare for add_RATid */ supportRateNum =rtw_get_rateset_len ((u8 *)&pcur_network->supported_rates);
drivers/staging/rtl8723bs/core/rtw_ap.c void start_bss_network(struct adapter *padapter) · line 662
Quoted 7 lines
drivers/staging/rtl8723bs/core/rtw_ap.c +3
-1@@ -655,7 +657,10 @@ void start_bss_network(struct adapter *padapter) cur_ch_offset =HAL_PRIME_CHNL_OFFSET_DONT_CARE ;/* check if there is wps ie, */ -/* if there is wpsie in beacon, the hostapd will update beacon twice when stating hostapd, */ +/* if there is wpsie in beacon, +*the hostapd will update beacon +*twice when stating hostapd,
Missing space after the asterisk.
regards,
dan carpenter
PATCH 3/4 staging: rtl8723bs: remove unnecessary blank lines in rtw_ap.c
In reply to Rohan TripathiThis patch removes superfluous blank lines and adds missing ones where appropriate to improve readability and match kernel coding style.
This is a coding style cleanup only. No functional changes.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +1 -2
@@ -438,7 +438,6 @@ void update_bmc_sta(struct adapter *padapter)spin_lock_bh (&psta->lock); psta->state = _FW_LINKED;spin_unlock_bh (&psta->lock); - } }
@@ -1240,7 +1239,6 @@ void rtw_acl_remove_sta(struct adapter *padapter, u8 *addr) }spin_unlock_bh (&pacl_node_q->lock); - }u8 rtw_ap_set_pairwise_key (struct adapter *padapter,struct sta_info *psta)
@@ -1974,6 +1972,7 @@ void ap_sta_info_defer_update(struct adapter *padapter, struct sta_info *psta)add_RATid (padapter, psta,0 );/* DM_RATR_STA_INIT */ } } +/* restore hw setting from sw data structures */ void rtw_ap_restore_network (struct adapter *padapter) {
Signature · 1 line
2.50.1
Re: [PATCH 3/4] staging: rtl8723bs: remove unnecessary blank lines in rtw_ap.c
Quoted 31 lines · Rohan Tripathi
This patch removes superfluous blank lines and adds missing ones where appropriate to improve readability and match kernel coding style.
This is a coding style cleanup only. No functional changes.
Signed-off-by Rohan Tripathi <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_ap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/staging/rtl8723bs/core/rtw_ap.c +0
-2@@ -438,7 +438,6 @@ void update_bmc_sta(struct adapter *padapter)spin_lock_bh (&psta->lock); psta->state = _FW_LINKED;spin_unlock_bh (&psta->lock); - } }@@ -1240,7 +1239,6 @@ void rtw_acl_remove_sta(struct adapter *padapter, u8 *addr) }spin_unlock_bh (&pacl_node_q->lock); - }u8 rtw_ap_set_pairwise_key (struct adapter *padapter,struct sta_info *psta)
drivers/staging/rtl8723bs/core/rtw_ap.c void ap_sta_info_defer_update(struct adapter *padapter, struct sta_info *psta) · line 1975
Quoted 4 lines
drivers/staging/rtl8723bs/core/rtw_ap.c +1
-0@@ -1974,6 +1972,7 @@ void ap_sta_info_defer_update(struct adapter *padapter, struct sta_info *psta)add_RATid (padapter, psta,0 );/* DM_RATR_STA_INIT */ } } +
This is adding a blank line, not removing.
regards,
dan carpenter
Quoted 6 lines
drivers/staging/rtl8723bs/core/rtw_ap.c +0
-0/* restore hw setting from sw data structures */ void rtw_ap_restore_network (struct adapter *padapter) {Signature · 1 line
2.50.1
PATCH 4/4 staging: rtl8723bs: fix operator spacing in rtw_ap.c
In reply to Rohan TripathiThis patch adjusts spacing around operators (such as '+', '-', '=') to follow kernel coding style guidelines and improve readability.
This is a coding style cleanup only. No functional changes.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +1 -1
@@ -1471,7 +1471,7 @@ static void update_bcn_wps_ie(struct adapter *padapter) wps_ielen = (uint )pwps_ie_src[1 ];/* to get ie data len */ if ((wps_offset + wps_ielen +2 + remainder_ielen) <=MAX_IE_SZ ) {memcpy (pwps_ie, pwps_ie_src, wps_ielen +2 ); - pwps_ie += (wps_ielen+2 ); + pwps_ie += (wps_ielen +2 );if (pbackup_remainder_ie)memcpy (pwps_ie, pbackup_remainder_ie, remainder_ielen);
Signature · 1 line
2.50.1
Quoted 9 lines · Rohan Tripathi
This patch fixes coding style issues where lines ended with an opening parenthesis. These expressions were reformatted so that opening parentheses remain on the same line as the statement, with proper alignment of continued arguments.
This is a coding style cleanup only. No functional changes.
Signed-off-by Rohan Tripathi <[email protected]>---
This needs to be marked as a v2:
https://staticthinking.wordpress.com/2022/07/27/how-to-send-a-v2-patch/
Quoted 8 lines
drivers/staging/rtl8723bs/core/rtw_ap.c | 250 +++++++++++------------- 1 file changed, 109 insertions(+), 141 deletions(-)drivers/staging/rtl8723bs/core/rtw_ap.c +0
-0
drivers/staging/rtl8723bs/core/rtw_ap.c void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta) · line 485
Quoted 9 lines
drivers/staging/rtl8723bs/core/rtw_ap.c +3
-3@@ -480,14 +480,13 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)/* check if sta supports rx ampdu */ phtpriv_sta->ampdu_enable = phtpriv_ap->ampdu_enable; - phtpriv_sta->rx_ampdu_min_spacing = ( - phtpriv_sta->ht_cap.ampdu_params_info &IEEE80211_HT_CAP_AMPDU_DENSITY - ) >>2 ; + phtpriv_sta->rx_ampdu_min_spacing = + (phtpriv_sta->ht_cap.ampdu_params_info & +IEEE80211_HT_CAP_AMPDU_DENSITY ) >>2 ;
No, still not nice. I think I would go over 80 characters.
phtpriv_sta->rx_ampdu_min_spacing = (phtpriv_sta->ht_cap.ampdu_params_info & IEEE80211_HT_CAP_AMPDU_DENSITY) >> 2;
Another option would be to do:
phtpriv_sta->rx_ampdu_min_spacing = (phtpriv_sta->ht_cap.ampdu_params_info & IEEE80211_HT_CAP_AMPDU_DENSITY) >> 2;
drivers/staging/rtl8723bs/core/rtw_ap.c void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta) · line 501
Quoted 9 lines
drivers/staging/rtl8723bs/core/rtw_ap.c +2
-3@@ -498,15 +497,13 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta) phtpriv_sta->ch_offset = pmlmeext->cur_ch_offset;/* check if sta support s Short GI 20M */ -if (( - phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info - ) &cpu_to_le16 (IEEE80211_HT_CAP_SGI_20 )) +if ((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info) & +cpu_to_le16 (IEEE80211_HT_CAP_SGI_20 ))
This needs to be done like so:
if ((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info) & cpu_to_le16(IEEE80211_HT_CAP_SGI_20))
[tab][tab][space][space][space][space]cpu_to_le16(IEEE80211_HT_CAP_SGI_20))
You get the idea. Same for the rest of the patchset.
regards,
dan carpenter