Code style cleanup
cover Code style cleanup
Checkpatch checks and warnings were cleaned up.
Ian To (4):
staging: rtl8723bs: remove unnecessary parentheses
staging: rtl8723bs: break up long lines
staging: rtl8723bs: fix spacing issues
staging: rtl8723bs: fixed comment styling
drivers/staging/rtl8723bs/core/rtw_mlme.c | 475 +++++++++++----------- 1 file changed, 244 insertions(+), 231 deletions(-)
Signature · 1 line
2.45.3
PATCH 1/4 staging: rtl8723bs: remove unnecessary parentheses
Removed unnecessary parentheses present in file.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 159 +++++++++++----------- 1 file changed, 80 insertions(+), 79 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +80 -79
@@ -119,7 +119,7 @@ struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv) pnetwork =NULL ; goto exit; } - plist =get_next (&(free_queue->queue)); + plist =get_next (&free_queue->queue); pnetwork = container_of(plist, struct wlan_network, list);
@@ -141,7 +141,7 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwor {unsigned int delta_time;u32 lifetime =SCANQUEUE_LIFETIME ; -struct __queue *free_queue = &(pmlmepriv->free_bss_pool); +struct __queue *free_queue = &pmlmepriv->free_bss_pool;if (!pnetwork)return ;
@@ -161,17 +161,16 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetworspin_lock_bh (&free_queue->lock); -list_del_init (&(pnetwork->list)); +list_del_init (&pnetwork->list); -list_add_tail (&(pnetwork->list), &(free_queue->queue)); +list_add_tail (&pnetwork->list, &free_queue->queue);spin_unlock_bh (&free_queue->lock); }void _rtw_free_network_nolock (struct mlme_priv *pmlmepriv,struct wlan_network *pnetwork) { - -struct __queue *free_queue = &(pmlmepriv->free_bss_pool); +struct __queue *free_queue = &pmlmepriv->free_bss_pool;if (!pnetwork)return ;
@@ -404,7 +403,8 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,long rssi_final;/* The rule below is 1/5 for sample value, 4/5 for history value */ -if (check_fwstate (&padapter->mlmepriv, _FW_LINKED) &&is_same_network (&(padapter->mlmepriv.cur_network.network), src,0 )) { +if (check_fwstate (&padapter->mlmepriv, _FW_LINKED) && +is_same_network (&padapter->mlmepriv.cur_network.network, src,0 )) {/* Take the recvpriv's value for the connected AP*/ ss_final = padapter->recvpriv.signal_strength; sq_final = padapter->recvpriv.signal_qual;
@@ -440,29 +440,31 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,static void update_current_network (struct adapter *adapter,struct wlan_bssid_ex *pnetwork) { -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -rtw_bug_check (&(pmlmepriv->cur_network.network), - &(pmlmepriv->cur_network.network), - &(pmlmepriv->cur_network.network), - &(pmlmepriv->cur_network.network)); +rtw_bug_check (&pmlmepriv->cur_network.network, + &pmlmepriv->cur_network.network, + &pmlmepriv->cur_network.network, + &pmlmepriv->cur_network.network); -if ((check_fwstate (pmlmepriv, _FW_LINKED) == true) && (is_same_network (&(pmlmepriv->cur_network.network), pnetwork,0 ))) { -update_network (&(pmlmepriv->cur_network.network), pnetwork, adapter, true); -rtw_update_protection (adapter, (pmlmepriv->cur_network.network.ies) +sizeof (struct ndis_802_11_fix_ie ), - pmlmepriv->cur_network.network.ie_length); +if ((check_fwstate (pmlmepriv, _FW_LINKED) == true) && + (is_same_network (&pmlmepriv->cur_network.network, pnetwork,0 ))) { +update_network (&pmlmepriv->cur_network.network, pnetwork, adapter, true); +rtw_update_protection (adapter, pmlmepriv->cur_network.network.ies + +sizeof (struct ndis_802_11_fix_ie ), + pmlmepriv->cur_network.network.ie_length); } }/* -Caller must hold pmlmepriv->lock first. -*/ +*Caller must hold pmlmepriv->lock first. +*/ void rtw_update_scanned_network (struct adapter *adapter,struct wlan_bssid_ex *target) {struct list_head *plist, *phead;u32 bssid_ex_sz; -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); -struct __queue *queue = &(pmlmepriv->scanned_queue); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv; +struct __queue *queue = &pmlmepriv->scanned_queue;struct wlan_network *pnetwork =NULL ;struct wlan_network *oldest =NULL ;int target_find =0 ;
@@ -475,7 +477,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *trtw_bug_check (pnetwork, pnetwork, pnetwork, pnetwork); -if (is_same_network (&(pnetwork->network), target, feature)) { +if (is_same_network (&pnetwork->network, target, feature)) { target_find =1 ;break ; }
@@ -492,14 +494,14 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t/* If we didn't find a match, then get a new network slot to initialize * with this beacon's information */ if (!target_find) { -if (list_empty (&pmlmepriv->free_bss_pool.queue)) { +if (list_empty & pmlmepriv->free_bss_pool.queue) {/* If there are no more slots, expire the oldest */ /* list_del_init(&oldest->list); */ pnetwork = oldest;if (!pnetwork) goto exit; -memcpy (&(pnetwork->network), target,get_wlan_bssid_ex_sz (target)); +memcpy (&pnetwork->network, target,get_wlan_bssid_ex_sz (target));/* variable initialize */ pnetwork->fixed = false; pnetwork->last_scanned = jiffies;
@@ -521,7 +523,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t bssid_ex_sz =get_wlan_bssid_ex_sz (target); target->length = bssid_ex_sz; -memcpy (&(pnetwork->network), target, bssid_ex_sz); +memcpy (&pnetwork->network, target, bssid_ex_sz); pnetwork->last_scanned = jiffies;
@@ -529,8 +531,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *tif (pnetwork->network.phy_info.signal_quality ==101 ) pnetwork->network.phy_info.signal_quality =0 ; -list_add_tail (&(pnetwork->list), &(queue->queue)); - +list_add_tail (&pnetwork->list, &queue->queue); } }else {/* we have an entry and we are going to update it. But this entry may
@@ -553,7 +554,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t update_ie = false; } -update_network (&(pnetwork->network), target, adapter, update_ie); +update_network (&pnetwork->network, target, adapter, update_ie); } exit:
@@ -629,7 +630,7 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf) {u32 len;struct wlan_bssid_ex *pnetwork; -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv; pnetwork = (struct wlan_bssid_ex *)pbuf;
@@ -645,14 +646,15 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)struct wlan_network *ibss_wlan =NULL ;memcpy (pmlmepriv->cur_network.network.ies, pnetwork->ies,8 ); -spin_lock_bh (&(pmlmepriv->scanned_queue.lock)); - ibss_wlan =rtw_find_network (&pmlmepriv->scanned_queue, pnetwork->mac_address); +spin_lock_bh (&pmlmepriv->scanned_queue.lock); + ibss_wlan =rtw_find_network (&pmlmepriv->scanned_queue, + pnetwork->mac_address);if (ibss_wlan) {memcpy (ibss_wlan->network.ies, pnetwork->ies,8 ); -spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_unlock_bh (&pmlmepriv->scanned_queue.lock); goto exit; } -spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_unlock_bh (&pmlmepriv->scanned_queue.lock); } }
@@ -670,7 +672,7 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)void rtw_surveydone_event_callback (struct adapter *adapter,u8 *pbuf) { -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv;spin_lock_bh (&pmlmepriv->lock);if (pmlmepriv->wps_probe_req_ie) {
@@ -697,7 +699,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)_set_timer (&pmlmepriv->assoc_timer,MAX_JOIN_TIMEOUT ); }else {u8 ret = _SUCCESS; -struct wlan_bssid_ex *pdev_network = &(adapter->registrypriv.dev_network); +struct wlan_bssid_ex *pdev_network = &adapter->registrypriv.dev_network;u8 *pibss = adapter->registrypriv.dev_network.mac_address;/* pmlmepriv->fw_state ^= _FW_UNDER_SURVEY;because don't set assoc_timer */
@@ -922,8 +924,8 @@ inline void rtw_indicate_scan_done(struct adapter *padapter, bool aborted)void rtw_scan_abort (struct adapter *adapter) {unsigned long start; -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); -struct mlme_ext_priv *pmlmeext = &(adapter->mlmeextpriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv; +struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; start = jiffies; pmlmeext->scan_abort = true;
@@ -1029,8 +1031,8 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str/* ptarget_wlan: found from scanned_queue */ static void rtw_joinbss_update_network (struct adapter *padapter,struct wlan_network *ptarget_wlan,struct wlan_network *pnetwork) { -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct wlan_network *cur_network = &(pmlmepriv->cur_network); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct wlan_network *cur_network = &pmlmepriv->cur_network;/* why not use ptarget_wlan?? */ memcpy (&cur_network->network, &pnetwork->network, pnetwork->network.length);
@@ -1086,9 +1088,9 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)static u8 __maybe_unused retry;struct sta_info *ptarget_sta =NULL , *pcur_sta =NULL ;struct sta_priv *pstapriv = &adapter->stapriv; -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv;struct wlan_network *pnetwork = (struct wlan_network *)pbuf; -struct wlan_network *cur_network = &(pmlmepriv->cur_network); +struct wlan_network *cur_network = &pmlmepriv->cur_network;struct wlan_network *pcur_wlan =NULL , *ptarget_wlan =NULL ;unsigned int the_same_macaddr = false;
@@ -1106,7 +1108,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) pmlmepriv->LinkDetectInfo.LowPowerTransitionCount =0 ;if (pnetwork->join_res >0 ) { -spin_lock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_lock_bh (&pmlmepriv->scanned_queue.lock); retry =0 ;if (check_fwstate (pmlmepriv, _FW_UNDER_LINKING)) {/* s1. find ptarget_wlan */
@@ -1143,7 +1145,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) }else {netdev_dbg (adapter->pnetdev,"Can't find ptarget_wlan when joinbss_event callback\n" ); -spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_unlock_bh (&pmlmepriv->scanned_queue.lock); goto ignore_joinbss_callback; }
@@ -1151,7 +1153,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true) { ptarget_sta =rtw_joinbss_update_stainfo (adapter, pnetwork);if (!ptarget_sta) { -spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_unlock_bh (&pmlmepriv->scanned_queue.lock); goto ignore_joinbss_callback; } }
@@ -1169,7 +1171,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)del_timer_sync (&pmlmepriv->assoc_timer);spin_lock_bh (&pmlmepriv->lock); }else { -spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_unlock_bh (&pmlmepriv->scanned_queue.lock); } }else if (pnetwork->join_res ==-4 ) {rtw_reset_securitypriv (adapter);
@@ -1226,16 +1228,16 @@ void rtw_sta_media_status_rpt(struct adapter *adapter, struct sta_info *psta, u3if (!psta)return ; - media_status_rpt = (u16)((psta->mac_id<<8 )|mstatus);/* MACID|OPMODE:1 connect */ + media_status_rpt = (u16)((psta->mac_id <<8 ) | mstatus);/* MACID|OPMODE:1 connect */ rtw_hal_set_hwreg (adapter,HW_VAR_H2C_MEDIA_STATUS_RPT , (u8 *)&media_status_rpt); }void rtw_stassoc_event_callback (struct adapter *adapter,u8 *pbuf) {struct sta_info *psta; -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv;struct stassoc_event *pstassoc = (struct stassoc_event *)pbuf; -struct wlan_network *cur_network = &(pmlmepriv->cur_network); +struct wlan_network *cur_network = &pmlmepriv->cur_network;struct wlan_network *ptarget_wlan =NULL ;if (rtw_access_ctrl (adapter, pstassoc->macaddr) == false)
@@ -1306,12 +1308,12 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) || (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) {if (adapter->stapriv.asoc_sta_count ==2 ) { -spin_lock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_lock_bh (&pmlmepriv->scanned_queue.lock); ptarget_wlan =rtw_find_network (&pmlmepriv->scanned_queue, cur_network->network.mac_address); pmlmepriv->cur_network_scanned = ptarget_wlan;if (ptarget_wlan) ptarget_wlan->fixed = true; -spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_unlock_bh (&pmlmepriv->scanned_queue.lock);/* a sta + bc/mc_stainfo (not Ibss_stainfo) */ rtw_indicate_connect (adapter); }
@@ -1329,11 +1331,11 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)struct wlan_network *pwlan =NULL ;struct wlan_bssid_ex *pdev_network =NULL ;u8 *pibss =NULL ; -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv;struct stadel_event *pstadel = (struct stadel_event *)pbuf; -struct wlan_network *tgt_network = &(pmlmepriv->cur_network); +struct wlan_network *tgt_network = &pmlmepriv->cur_network;struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; psta =rtw_get_stainfo (&adapter->stapriv, pstadel->macaddr);if (psta)
@@ -1385,14 +1387,14 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)rtw_free_assoc_resources (adapter,1 );rtw_indicate_disconnect (adapter); -spin_lock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_lock_bh (&pmlmepriv->scanned_queue.lock);/* remove the network entry in scanned_queue */ pwlan =rtw_find_network (&pmlmepriv->scanned_queue, tgt_network->network.mac_address);if (pwlan) { pwlan->fixed = false;rtw_free_network_nolock (adapter, pwlan); } -spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_unlock_bh (&pmlmepriv->scanned_queue.lock);_rtw_roaming (adapter, roam_target); }
@@ -1404,16 +1406,17 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)if (adapter->stapriv.asoc_sta_count ==1 ) {/* a sta + bc/mc_stainfo (not Ibss_stainfo) */ u8 ret = _SUCCESS; -spin_lock_bh (&(pmlmepriv->scanned_queue.lock)); + +spin_lock_bh (&pmlmepriv->scanned_queue.lock);/* free old ibss network */ pwlan =rtw_find_network (&pmlmepriv->scanned_queue, tgt_network->network.mac_address);if (pwlan) { pwlan->fixed = false;rtw_free_network_nolock (adapter, pwlan); } -spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_unlock_bh (&pmlmepriv->scanned_queue.lock);/* re-create ibss */ - pdev_network = &(adapter->registrypriv.dev_network); + pdev_network = &adapter->registrypriv.dev_network; pibss = adapter->registrypriv.dev_network.mac_address;memcpy (pdev_network, &tgt_network->network,get_wlan_bssid_ex_sz (&tgt_network->network));
@@ -1521,7 +1524,7 @@ void rtw_mlme_reset_auto_scan_int(struct adapter *adapter) {struct mlme_priv *mlme = &adapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if (pmlmeinfo->VHT_enable)/* disable auto scan when connect to 11AC AP */ mlme->auto_scan_int_ms =0 ;
@@ -1662,7 +1665,7 @@ int rtw_select_roaming_candidate(struct mlme_priv *mlme) {int ret = _FAIL;struct list_head *phead; -struct __queue *queue = &(mlme->scanned_queue); +struct __queue *queue = &mlme->scanned_queue;struct wlan_network *pnetwork =NULL ;struct wlan_network *candidate =NULL ;
@@ -1671,16 +1674,14 @@ int rtw_select_roaming_candidate(struct mlme_priv *mlme)return ret; } -spin_lock_bh (&(mlme->scanned_queue.lock)); +spin_lock_bh (&mlme->scanned_queue.lock); phead =get_list_head (queue);list_for_each (mlme->pscanned, phead) { - pnetwork = list_entry(mlme->pscanned, struct wlan_network, list);rtw_check_roaming_candidate (mlme, &candidate, pnetwork); - }if (!candidate) {
@@ -1695,7 +1696,7 @@ int rtw_select_roaming_candidate(struct mlme_priv *mlme) ret = _SUCCESS; exit: -spin_unlock_bh (&(mlme->scanned_queue.lock)); +spin_unlock_bh (&mlme->scanned_queue.lock);return ret; }
@@ -1745,24 +1746,24 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme }/* -Calling context: -The caller of the sub-routine will be in critical section... -The caller must hold the following spinlock -pmlmepriv->lock -*/ +*Calling context: +*The caller of the sub-routine will be in critical section... +*The caller must hold the following spinlock +*pmlmepriv->lock +*/ int rtw_select_and_join_from_scanned_queue (struct mlme_priv *pmlmepriv) {int ret;struct list_head *phead;struct adapter *adapter; -struct __queue *queue = &(pmlmepriv->scanned_queue); +struct __queue *queue = &pmlmepriv->scanned_queue;struct wlan_network *pnetwork =NULL ;struct wlan_network *candidate =NULL ; adapter = (struct adapter *)pmlmepriv->nic_hdl; -spin_lock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_lock_bh (&pmlmepriv->scanned_queue.lock);if (pmlmepriv->roam_network) { candidate = pmlmepriv->roam_network;
@@ -1800,7 +1801,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) ret =rtw_joinbss_cmd (adapter, candidate); exit: -spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_unlock_bh (&pmlmepriv->scanned_queue.lock);return ret; }
@@ -1808,7 +1809,7 @@ signed int rtw_set_auth(struct adapter *adapter, struct security_priv *psecurity {struct cmd_obj *pcmd;struct setauth_parm *psetauthparm; -struct cmd_priv *pcmdpriv = &(adapter->cmdpriv); +struct cmd_priv *pcmdpriv = &adapter->cmdpriv;signed int res = _SUCCESS; pcmd =rtw_zmalloc (sizeof (struct cmd_obj ));
@@ -1840,12 +1841,13 @@ signed int rtw_set_auth(struct adapter *adapter, struct security_priv *psecurityreturn res; } -signed int rtw_set_key (struct adapter *adapter,struct security_priv *psecuritypriv,signed int keyid,u8 set_tx,bool enqueue) +signed int rtw_set_key (struct adapter *adapter,struct security_priv *psecuritypriv, +signed int keyid,u8 set_tx,bool enqueue) {u8 keylen;struct cmd_obj *pcmd;struct setkey_parm *psetkeyparm; -struct cmd_priv *pcmdpriv = &(adapter->cmdpriv); +struct cmd_priv *pcmdpriv = &adapter->cmdpriv;signed int res = _SUCCESS; psetkeyparm =rtw_zmalloc (sizeof (struct setkey_parm ));
@@ -1865,14 +1867,13 @@ signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp adapter->securitypriv.key_mask |=BIT (psetkeyparm->keyid);switch (psetkeyparm->algorithm) { -case _WEP40_: keylen =5 ; -memcpy (&(psetkeyparm->key[0 ]), &(psecuritypriv->dot11DefKey[keyid].skey[0 ]), keylen); +memcpy (&psetkeyparm->key[0 ], &psecuritypriv->dot11DefKey[keyid].skey[0 ], keylen);break ;case _WEP104_: keylen =13 ; -memcpy (&(psetkeyparm->key[0 ]), &(psecuritypriv->dot11DefKey[keyid].skey[0 ]), keylen); +memcpy (&psetkeyparm->key[0 ], &psecuritypriv->dot11DefKey[keyid].skey[0 ], keylen);break ;case _TKIP_: keylen =16 ;
@@ -2035,7 +2036,7 @@ void rtw_init_registrypriv_dev_network(struct adapter *adapter) {struct registry_priv *pregistrypriv = &adapter->registrypriv;struct eeprom_priv *peepriv = &adapter->eeprompriv; -struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network; +struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network;u8 *myhwaddr =myid (peepriv);memcpy (pdev_network->mac_address, myhwaddr,ETH_ALEN );
@@ -2335,7 +2336,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channestruct ht_priv *phtpriv = &pmlmepriv->htpriv;struct registry_priv *pregistrypriv = &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;u8 cbw40_enable =0 ;if (!phtpriv->ht_option)
Signature · 1 line
2.45.3
PATCH 2/4 staging: rtl8723bs: break up long lines
In reply to Ian ToLong lines were broken up into smaller ones to comply with coding style.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 135 +++++++++++++--------- 1 file changed, 82 insertions(+), 53 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +82 -53
@@ -95,7 +95,8 @@ void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv)rtw_free_mlme_ie_data (&pmlmepriv->p2p_beacon_ie, &pmlmepriv->p2p_beacon_ie_len);rtw_free_mlme_ie_data (&pmlmepriv->p2p_probe_req_ie, &pmlmepriv->p2p_probe_req_ie_len);rtw_free_mlme_ie_data (&pmlmepriv->p2p_probe_resp_ie, &pmlmepriv->p2p_probe_resp_ie_len); -rtw_free_mlme_ie_data (&pmlmepriv->p2p_go_probe_resp_ie, &pmlmepriv->p2p_go_probe_resp_ie_len); +rtw_free_mlme_ie_data (&pmlmepriv->p2p_go_probe_resp_ie, + &pmlmepriv->p2p_go_probe_resp_ie_len);rtw_free_mlme_ie_data (&pmlmepriv->p2p_assoc_req_ie, &pmlmepriv->p2p_assoc_req_ie_len); }
@@ -178,9 +179,9 @@ void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *if (pnetwork->fixed)return ; -list_del_init (&(pnetwork->list)); +list_del_init (&pnetwork->list); -list_add_tail (&(pnetwork->list),get_list_head (free_queue)); +list_add_tail (&pnetwork->list,get_list_head (free_queue)); }/*
@@ -286,7 +287,7 @@ void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv)void rtw_free_network_nolock (struct adapter *padapter,struct wlan_network *pnetwork);void rtw_free_network_nolock (struct adapter *padapter,struct wlan_network *pnetwork) { -_rtw_free_network_nolock (&(padapter->mlmepriv), pnetwork); +_rtw_free_network_nolock (&padapter->mlmepriv, pnetwork);rtw_cfg80211_unlink_bss (padapter, pnetwork); }
@@ -347,10 +348,10 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 fea (d_cap & WLAN_CAPABILITY_IBSS)) && ((s_cap &WLAN_CAPABILITY_ESS ) == (d_cap &WLAN_CAPABILITY_ESS )); - } -struct wlan_network *_rtw_find_same_network (struct __queue *scanned_queue,struct wlan_network *network) +struct wlan_network *_rtw_find_same_network (struct __queue *scanned_queue, +struct wlan_network *network) {struct list_head *phead, *plist;struct wlan_network *found =NULL ;
@@ -588,11 +589,12 @@ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwor privacy = pnetwork->network.privacy;if (check_fwstate (pmlmepriv,WIFI_UNDER_WPS )) { -if (rtw_get_wps_ie (pnetwork->network.ies+_FIXED_IE_LENGTH_, pnetwork->network.ie_length-_FIXED_IE_LENGTH_,NULL , &wps_ielen)) +if (rtw_get_wps_ie (pnetwork->network.ies + _FIXED_IE_LENGTH_, + pnetwork->network.ie_length - _FIXED_IE_LENGTH_, +NULL , &wps_ielen))return true;else return false; - }if (adapter->registrypriv.wifi_spec ==1 ) {/* for correct flow of 8021X to do.... */ u8 *p =NULL ;
@@ -602,7 +604,8 @@ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwor bselected = false;if (psecuritypriv->ndisauthtype == Ndis802_11AuthModeWPA2PSK) { - p =rtw_get_ie (pnetwork->network.ies + _BEACON_IE_OFFSET_,WLAN_EID_RSN , &ie_len, (pnetwork->network.ie_length - _BEACON_IE_OFFSET_)); + p =rtw_get_ie (pnetwork->network.ies + _BEACON_IE_OFFSET_,WLAN_EID_RSN , + &ie_len, (pnetwork->network.ie_length - _BEACON_IE_OFFSET_));if (p && ie_len >0 ) bselected = true;else
@@ -614,7 +617,8 @@ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwor bselected = false;if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true) { -if (pnetwork->network.infrastructure_mode != pmlmepriv->cur_network.network.infrastructure_mode) +if (pnetwork->network.infrastructure_mode != + pmlmepriv->cur_network.network.infrastructure_mode) bselected = false; }
@@ -642,7 +646,8 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)/* update IBSS_network 's timestamp */ if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) == true) { -if (!memcmp (&(pmlmepriv->cur_network.network.mac_address), pnetwork->mac_address,ETH_ALEN )) { +if (!memcmp (&pmlmepriv->cur_network.network.mac_address, + pnetwork->mac_address,ETH_ALEN )) {struct wlan_network *ibss_wlan =NULL ;memcpy (pmlmepriv->cur_network.network.ies, pnetwork->ies,8 );
@@ -705,7 +710,8 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)/* pmlmepriv->fw_state ^= _FW_UNDER_SURVEY;because don't set assoc_timer */ _clr_fwstate_ (pmlmepriv, _FW_UNDER_SURVEY); -memcpy (&pdev_network->ssid, &pmlmepriv->assoc_ssid,sizeof (struct ndis_802_11_ssid )); +memcpy (&pdev_network->ssid, &pmlmepriv->assoc_ssid, +sizeof (struct ndis_802_11_ssid ));rtw_update_registrypriv_dev_network (adapter);rtw_generate_random_ibss (pibss);
@@ -732,8 +738,9 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)rtw_indicate_connect (adapter); }else {if (rtw_to_roam (adapter) !=0 ) { -if (rtw_dec_to_roam (adapter) ==0 - || _SUCCESS !=rtw_sitesurvey_cmd (adapter, &pmlmepriv->assoc_ssid,1 ,NULL ,0 ) +if (rtw_dec_to_roam (adapter) ==0 || + _SUCCESS !=rtw_sitesurvey_cmd (adapter, + &pmlmepriv->assoc_ssid,1 ,NULL ,0 ) ) {rtw_set_to_roam (adapter,0 );rtw_free_assoc_resources (adapter,1 );
@@ -749,10 +756,11 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) } }else {if (rtw_chk_roam_flags (adapter,RTW_ROAM_ACTIVE )) { -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) - &&check_fwstate (pmlmepriv, _FW_LINKED)) { +if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) && +check_fwstate (pmlmepriv, _FW_LINKED)) {if (rtw_select_roaming_candidate (pmlmepriv) == _SUCCESS) { -receive_disconnect (adapter, pmlmepriv->cur_network.network.mac_address +receive_disconnect (adapter, + pmlmepriv->cur_network.network.mac_address ,WLAN_REASON_ACTIVE_ROAM ); } }
@@ -893,8 +901,8 @@ void rtw_indicate_disconnect(struct adapter *padapter)if (rtw_to_roam (padapter) >0 )_clr_fwstate_ (pmlmepriv, _FW_LINKED); -if (check_fwstate (&padapter->mlmepriv, _FW_LINKED) - || (rtw_to_roam (padapter) <=0 ) +if (check_fwstate (&padapter->mlmepriv, _FW_LINKED) || + (rtw_to_roam (padapter) <=0 ) ) {rtw_os_indicate_disconnect (padapter);
@@ -929,9 +937,8 @@ void rtw_scan_abort(struct adapter *adapter) start = jiffies; pmlmeext->scan_abort = true; -while (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY) - &&jiffies_to_msecs (start) <=200 ) { - +while (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY) && +jiffies_to_msecs (start) <=200 ) {if (adapter->bDriverStopped || adapter->bSurpriseRemoved)break ;
@@ -944,7 +951,8 @@ void rtw_scan_abort(struct adapter *adapter) pmlmeext->scan_abort = false; } -static struct sta_info *rtw_joinbss_update_stainfo (struct adapter *padapter,struct wlan_network *pnetwork) +static struct sta_info *rtw_joinbss_update_stainfo (struct adapter *padapter, +struct wlan_network *pnetwork) {int i;struct sta_info *bmc_sta, *psta =NULL ;
@@ -1029,7 +1037,8 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str/* pnetwork : returns from rtw_joinbss_event_callback */ /* ptarget_wlan: found from scanned_queue */ -static void rtw_joinbss_update_network (struct adapter *padapter,struct wlan_network *ptarget_wlan,struct wlan_network *pnetwork) +static void rtw_joinbss_update_network (struct adapter *padapter,struct wlan_network *ptarget_wlan, +struct wlan_network *pnetwork) {struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct wlan_network *cur_network = &pmlmepriv->cur_network;
@@ -1069,10 +1078,12 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_netbreak ; } -rtw_update_protection (padapter, (cur_network->network.ies) +sizeof (struct ndis_802_11_fix_ie ), - (cur_network->network.ie_length)); +rtw_update_protection (padapter, + (cur_network->network.ies) +sizeof (struct ndis_802_11_fix_ie ), + (cur_network->network.ie_length)); -rtw_update_ht_cap (padapter, cur_network->network.ies, cur_network->network.ie_length, (u8 ) cur_network->network.configuration.ds_config); +rtw_update_ht_cap (padapter, cur_network->network.ies, cur_network->network.ie_length, + (u8 )cur_network->network.configuration.ds_config); }/* Notes: the function could be > passive_level (the same context as Rx tasklet) */
@@ -1096,7 +1107,8 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)rtw_get_encrypt_decrypt_from_registrypriv (adapter); - the_same_macaddr = !memcmp (pnetwork->network.mac_address, cur_network->network.mac_address,ETH_ALEN ); + the_same_macaddr = !memcmp (pnetwork->network.mac_address, + cur_network->network.mac_address,ETH_ALEN ); pnetwork->network.length =get_wlan_bssid_ex_sz (&pnetwork->network);if (pnetwork->network.length >sizeof (struct wlan_bssid_ex ))
@@ -1114,9 +1126,11 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)/* s1. find ptarget_wlan */ if (check_fwstate (pmlmepriv, _FW_LINKED)) {if (the_same_macaddr) { - ptarget_wlan =rtw_find_network (&pmlmepriv->scanned_queue, cur_network->network.mac_address); + ptarget_wlan =rtw_find_network (&pmlmepriv->scanned_queue, + cur_network->network.mac_address); }else { - pcur_wlan =rtw_find_network (&pmlmepriv->scanned_queue, cur_network->network.mac_address); + pcur_wlan =rtw_find_network (&pmlmepriv->scanned_queue, + cur_network->network.mac_address);if (pcur_wlan) pcur_wlan->fixed = false;
@@ -1366,9 +1380,11 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)if (adapter->registrypriv.wifi_spec ==1 ) { roam = false; - }else if (reason ==WLAN_REASON_EXPIRATION_CHK &&rtw_chk_roam_flags (adapter,RTW_ROAM_ON_EXPIRED )) { + }else if (reason ==WLAN_REASON_EXPIRATION_CHK && +rtw_chk_roam_flags (adapter,RTW_ROAM_ON_EXPIRED )) { roam = true; - }else if (reason ==WLAN_REASON_ACTIVE_ROAM &&rtw_chk_roam_flags (adapter,RTW_ROAM_ACTIVE )) { + }else if (reason ==WLAN_REASON_ACTIVE_ROAM && +rtw_chk_roam_flags (adapter,RTW_ROAM_ACTIVE )) { roam = true; roam_target = pmlmepriv->roam_network; }
@@ -1409,7 +1425,8 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)spin_lock_bh (&pmlmepriv->scanned_queue.lock);/* free old ibss network */ - pwlan =rtw_find_network (&pmlmepriv->scanned_queue, tgt_network->network.mac_address); + pwlan =rtw_find_network (&pmlmepriv->scanned_queue, + tgt_network->network.mac_address);if (pwlan) { pwlan->fixed = false;rtw_free_network_nolock (adapter, pwlan);
@@ -1419,9 +1436,11 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) pdev_network = &adapter->registrypriv.dev_network; pibss = adapter->registrypriv.dev_network.mac_address; -memcpy (pdev_network, &tgt_network->network,get_wlan_bssid_ex_sz (&tgt_network->network)); +memcpy (pdev_network, &tgt_network->network, +get_wlan_bssid_ex_sz (&tgt_network->network)); -memcpy (&pdev_network->ssid, &pmlmepriv->assoc_ssid,sizeof (struct ndis_802_11_ssid )); +memcpy (&pdev_network->ssid, &pmlmepriv->assoc_ssid, +sizeof (struct ndis_802_11_ssid ));rtw_update_registrypriv_dev_network (adapter);
@@ -1543,9 +1562,8 @@ static void rtw_auto_scan_handler(struct adapter *padapter)rtw_mlme_reset_auto_scan_int (padapter); -if (pmlmepriv->auto_scan_int_ms !=0 - &&jiffies_to_msecs (jiffies - pmlmepriv->scan_start_time) > pmlmepriv->auto_scan_int_ms) { - +if (pmlmepriv->auto_scan_int_ms !=0 && +jiffies_to_msecs (jiffies - pmlmepriv->scan_start_time) > pmlmepriv->auto_scan_int_ms) {if (!padapter->registrypriv.wifi_spec) {if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING) == true) goto exit;
@@ -1575,8 +1593,8 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter)if (adapter->net_closed)return ; -if ((adapter_to_pwrctl (adapter)->fw_current_in_ps_mode) - && !(hal_btcoex_IsBtControlLps (adapter)) +if ((adapter_to_pwrctl (adapter)->fw_current_in_ps_mode) && + !(hal_btcoex_IsBtControlLps (adapter)) ) {u8 bEnterPS;
@@ -1647,7 +1665,8 @@ static int rtw_check_roaming_candidate(struct mlme_priv *mlmeif (jiffies_to_msecs (jiffies - competitor->last_scanned) >= mlme->roam_scanr_exp_ms) goto exit; -if (competitor->network.rssi - mlme->cur_network_scanned->network.rssi < mlme->roam_rssi_diff_th) +if (competitor->network.rssi - mlme->cur_network_scanned->network.rssi < + mlme->roam_rssi_diff_th) goto exit;if (*candidate && (*candidate)->network.rssi >= competitor->network.rssi)
@@ -1720,8 +1739,9 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme/* check ssid, if needed */ if (mlme->assoc_ssid.ssid[0 ] && mlme->assoc_ssid.ssid_length) { -if (competitor->network.ssid.ssid_length != mlme->assoc_ssid.ssid_length - ||memcmp (competitor->network.ssid.ssid, mlme->assoc_ssid.ssid, mlme->assoc_ssid.ssid_length) +if (competitor->network.ssid.ssid_length != mlme->assoc_ssid.ssid_length || +memcmp (competitor->network.ssid.ssid, mlme->assoc_ssid.ssid, + mlme->assoc_ssid.ssid_length) ) goto exit; }
@@ -1730,8 +1750,9 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme goto exit;if (rtw_to_roam (adapter) >0 ) { -if (jiffies_to_msecs (jiffies - competitor->last_scanned) >= mlme->roam_scanr_exp_ms - ||is_same_ess (&competitor->network, &mlme->cur_network.network) == false +if (jiffies_to_msecs (jiffies - competitor->last_scanned) >= + mlme->roam_scanr_exp_ms || +is_same_ess (&competitor->network, &mlme->cur_network.network) == false ) goto exit; }
@@ -1917,7 +1938,8 @@ signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp }/* adjust ies for rtw_joinbss_cmd in WMM */ -int rtw_restruct_wmm_ie (struct adapter *adapter,u8 *in_ie,u8 *out_ie,uint in_len,uint initial_out_len) +int rtw_restruct_wmm_ie (struct adapter *adapter,u8 *in_ie,u8 *out_ie,uint in_len, +uint initial_out_len) {unsigned int ielength =0 ;unsigned int i, j;
@@ -1926,7 +1948,8 @@ int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_while (i < in_len) { ielength = initial_out_len; -if (in_ie[i] ==0xDD && in_ie[i+2 ] ==0x00 && in_ie[i+3 ] ==0x50 && in_ie[i+4 ] ==0xF2 && in_ie[i+5 ] ==0x02 && i+5 < in_len) {/* WMM element ID and OUI */ +if (in_ie[i] ==0xDD && in_ie[i +2 ] ==0x00 && in_ie[i +3 ] ==0x50 && + in_ie[i +4 ] ==0xF2 && in_ie[i +5 ] ==0x02 && i +5 < in_len) {/* WMM element ID and OUI */ for (j = i; j < i +9 ; j++) { out_ie[ielength] = in_ie[j]; ielength++;
@@ -2017,8 +2040,9 @@ signed int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, u ielength += psecuritypriv->wps_ie_len; }else if ((authmode ==WLAN_EID_VENDOR_SPECIFIC ) || (authmode ==WLAN_EID_RSN )) {/* copy RSN or SSN */ -memcpy (&out_ie[ielength], &psecuritypriv->supplicant_ie[0 ], psecuritypriv->supplicant_ie[1 ]+2 ); - ielength += psecuritypriv->supplicant_ie[1 ]+2 ; +memcpy (&out_ie[ielength], &psecuritypriv->supplicant_ie[0 ], + psecuritypriv->supplicant_ie[1 ] +2 ); + ielength += psecuritypriv->supplicant_ie[1 ] +2 ;rtw_report_sec_ie (adapter, authmode, psecuritypriv->supplicant_ie); }
@@ -2198,7 +2222,8 @@ void rtw_build_wmm_ie_ht(struct adapter *padapter, u8 *out_ie, uint *pout_len) }/* the function is >= passive_level */ -unsigned int rtw_restructure_ht_ie (struct adapter *padapter,u8 *in_ie,u8 *out_ie,uint in_len,uint *pout_len,u8 channel) +unsigned int rtw_restructure_ht_ie (struct adapter *padapter,u8 *in_ie,u8 *out_ie, +uint in_len,uint *pout_len,u8 channel) {u32 ielen, out_len;enum ieee80211_max_ampdu_length_exp max_rx_ampdu_factor;
@@ -2351,7 +2376,8 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe/* check Max Rx A-MPDU Size */ len =0 ; - p =rtw_get_ie (pie+sizeof (struct ndis_802_11_fix_ie ),WLAN_EID_HT_CAPABILITY , &len, ie_len-sizeof (struct ndis_802_11_fix_ie )); + p =rtw_get_ie (pie +sizeof (struct ndis_802_11_fix_ie ),WLAN_EID_HT_CAPABILITY , &len, + ie_len -sizeof (struct ndis_802_11_fix_ie ));if (p && len >0 ) { pht_capie = (struct ieee80211_ht_cap *)(p+2 ); max_ampdu_sz = (pht_capie->ampdu_params_info &IEEE80211_HT_CAP_AMPDU_FACTOR );
@@ -2362,7 +2388,8 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe } len =0 ; - p =rtw_get_ie (pie+sizeof (struct ndis_802_11_fix_ie ),WLAN_EID_HT_OPERATION , &len, ie_len-sizeof (struct ndis_802_11_fix_ie )); + p =rtw_get_ie (pie +sizeof (struct ndis_802_11_fix_ie ),WLAN_EID_HT_OPERATION , &len, + ie_len -sizeof (struct ndis_802_11_fix_ie ));if (p && len >0 ) {/* todo: */ }
@@ -2495,13 +2522,15 @@ void rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network)_rtw_roaming (padapter, tgt_network);spin_unlock_bh (&pmlmepriv->lock); } +void _rtw_roaming (struct adapter *padapter,struct wlan_network *tgt_network) {struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct wlan_network *cur_network = &pmlmepriv->cur_network;if (rtw_to_roam (padapter) >0 ) { -memcpy (&pmlmepriv->assoc_ssid, &cur_network->network.ssid,sizeof (struct ndis_802_11_ssid )); +memcpy (&pmlmepriv->assoc_ssid, &cur_network->network.ssid, +sizeof (struct ndis_802_11_ssid )); pmlmepriv->assoc_by_bssid = false;
Signature · 1 line
2.45.3
PATCH 3/4 staging: rtl8723bs: fix spacing issues
In reply to Ian ToSpacing was not compliant with the coding style.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 110 +++++++++------------- 1 file changed, 47 insertions(+), 63 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +47 -63
@@ -151,7 +151,7 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetworreturn ;if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) + (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) lifetime =1 ;if (!isfreeall) {
@@ -225,11 +225,9 @@ void rtw_free_network_queue(struct adapter *padapter, u8 isfreeall) phead =get_list_head (scanned_queue);list_for_each_safe (plist, tmp, phead) { - pnetwork = list_entry(plist, struct wlan_network, list);_rtw_free_network (pmlmepriv, pnetwork, isfreeall); - }spin_unlock_bh (&scanned_queue->lock);
@@ -240,7 +238,7 @@ signed int rtw_if_up(struct adapter *padapter)signed int res;if (padapter->bDriverStopped || padapter->bSurpriseRemoved || - (check_fwstate (&padapter->mlmepriv, _FW_LINKED) == false)) + (check_fwstate (&padapter->mlmepriv, _FW_LINKED) == false)) res = false;else res = true;
@@ -256,8 +254,8 @@ void rtw_generate_random_ibss(u8 *pibss) pibss[1 ] =0x11 ; pibss[2 ] =0x87 ; pibss[3 ] = (u8)(curtime &0xff ) ;/* p[0]; */ - pibss[4 ] = (u8)((curtime>>8 ) &0xff ) ;/* p[1]; */ - pibss[5 ] = (u8)((curtime>>16 ) &0xff ) ;/* p[2]; */ + pibss[4 ] = (u8)((curtime >>8 ) &0xff ) ;/* p[1]; */ + pibss[5 ] = (u8)((curtime >>16 ) &0xff ) ;/* p[2]; */ }u8 *rtw_get_capability_from_ie (u8 *ie)
@@ -309,7 +307,7 @@ int rtw_is_same_ibss(struct adapter *adapter, struct wlan_network *pnetwork)struct security_priv *psecuritypriv = &adapter->securitypriv;if ((psecuritypriv->dot11PrivacyAlgrthm != _NO_PRIVACY_) && - (pnetwork->network.privacy ==0 )) + (pnetwork->network.privacy ==0 )) ret = false;else if ((psecuritypriv->dot11PrivacyAlgrthm == _NO_PRIVACY_) && (pnetwork->network.privacy ==1 ))
@@ -318,13 +316,12 @@ int rtw_is_same_ibss(struct adapter *adapter, struct wlan_network *pnetwork) ret = true;return ret; - }inline int is_same_ess (struct wlan_bssid_ex *a,struct wlan_bssid_ex *b) { -return (a->ssid.ssid_length == b->ssid.ssid_length) - && !memcmp (a->ssid.ssid, b->ssid.ssid, a->ssid.ssid_length); +return (a->ssid.ssid_length == b->ssid.ssid_length) && + !memcmp (a->ssid.ssid, b->ssid.ssid, a->ssid.ssid_length); }int is_same_network (struct wlan_bssid_ex *src,struct wlan_bssid_ex *dst,u8 feature)
@@ -380,7 +377,6 @@ struct wlan_network *rtw_get_oldest_wlan_network(struct __queue *scanned_queue) phead =get_list_head (scanned_queue);list_for_each (plist, phead) { - pwlan = list_entry(plist, struct wlan_network, list);if (!pwlan->fixed) {
@@ -389,11 +385,10 @@ struct wlan_network *rtw_get_oldest_wlan_network(struct __queue *scanned_queue) } }return oldest; - }void update_network (struct wlan_bssid_ex *dst,struct wlan_bssid_ex *src, -struct adapter *padapter,bool update_ie) +struct adapter *padapter,bool update_ie) {long rssi_ori = dst->rssi;
@@ -411,21 +406,20 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, sq_final = padapter->recvpriv.signal_qual;/* the rssi value here is undecorated, and will be used for antenna diversity */ if (sq_smp !=101 )/* from the right channel */ - rssi_final = (src->rssi+dst->rssi*4 )/5 ; + rssi_final = (src->rssi + dst->rssi *4 ) /5 ;else rssi_final = rssi_ori; }else {if (sq_smp !=101 ) {/* from the right channel */ - ss_final = ((u32)(src->phy_info.signal_strength)+(u32)(dst->phy_info.signal_strength)*4 )/5 ; - sq_final = ((u32)(src->phy_info.signal_quality)+(u32)(dst->phy_info.signal_quality)*4 )/5 ; - rssi_final = (src->rssi+dst->rssi*4 )/5 ; + ss_final = ((u32)(src->phy_info.signal_strength) + (u32)(dst->phy_info.signal_strength) *4 ) /5 ; + sq_final = ((u32)(src->phy_info.signal_quality) + (u32)(dst->phy_info.signal_quality) *4 ) /5 ; + rssi_final = (src->rssi + dst->rssi *4 ) /5 ; }else {/* bss info not receiving from the right channel, use the original RX signal infos */ ss_final = dst->phy_info.signal_strength; sq_final = dst->phy_info.signal_quality; rssi_final = dst->rssi; } - }if (update_ie) {
@@ -842,14 +836,14 @@ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue)struct dvobj_priv *psdpriv = adapter->dvobj;struct debug_priv *pdbgpriv = &psdpriv->drv_dbg; -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE |WIFI_AP_STATE )) { +if (check_fwstate (pmlmepriv,WIFI_STATION_STATE |WIFI_AP_STATE )) {struct sta_info *psta; psta =rtw_get_stainfo (&adapter->stapriv, tgt_network->network.mac_address);rtw_free_stainfo (adapter, psta); } -if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE |WIFI_ADHOC_MASTER_STATE |WIFI_AP_STATE )) { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE |WIFI_ADHOC_MASTER_STATE |WIFI_AP_STATE )) {struct sta_info *psta;rtw_free_all_stainfo (adapter);
@@ -878,7 +872,6 @@ void rtw_indicate_connect(struct adapter *padapter) pmlmepriv->to_join = false;if (!check_fwstate (&padapter->mlmepriv, _FW_LINKED)) { -set_fwstate (pmlmepriv, _FW_LINKED);rtw_os_indicate_connect (padapter);
@@ -886,7 +879,6 @@ void rtw_indicate_connect(struct adapter *padapter)rtw_set_to_roam (padapter,0 );rtw_set_scan_deny (padapter,3000 ); - }/*
@@ -896,7 +888,7 @@ void rtw_indicate_disconnect(struct adapter *padapter) {struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -_clr_fwstate_ (pmlmepriv, _FW_UNDER_LINKING|WIFI_UNDER_WPS ); +_clr_fwstate_ (pmlmepriv, _FW_UNDER_LINKING |WIFI_UNDER_WPS );if (rtw_to_roam (padapter) >0 )_clr_fwstate_ (pmlmepriv, _FW_LINKED);
@@ -923,7 +915,7 @@ inline void rtw_indicate_scan_done(struct adapter *padapter, bool aborted)if ((!adapter_to_pwrctl (padapter)->bInSuspend) && (!check_fwstate (&padapter->mlmepriv, -WIFI_ASOC_STATE |WIFI_UNDER_LINKING ))) { +WIFI_ASOC_STATE |WIFI_UNDER_LINKING ))) {rtw_set_ips_deny (padapter,0 );_set_timer (&padapter->mlmepriv.dynamic_chk_timer,1 ); }
@@ -1032,7 +1024,6 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, }return psta; - }/* pnetwork : returns from rtw_joinbss_event_callback */
@@ -1064,8 +1055,8 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_netswitch (pnetwork->network.infrastructure_mode) {case Ndis802_11Infrastructure: -if (pmlmepriv->fw_state&WIFI_UNDER_WPS ) - pmlmepriv->fw_state =WIFI_STATION_STATE |WIFI_UNDER_WPS ; +if (pmlmepriv->fw_state &WIFI_UNDER_WPS ) + pmlmepriv->fw_state =WIFI_STATION_STATE |WIFI_UNDER_WPS ;else pmlmepriv->fw_state =WIFI_STATION_STATE ;
@@ -1320,7 +1311,7 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)spin_lock_bh (&pmlmepriv->lock);if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) { + (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) {if (adapter->stapriv.asoc_sta_count ==2 ) {spin_lock_bh (&pmlmepriv->scanned_queue.lock); ptarget_wlan =rtw_find_network (&pmlmepriv->scanned_queue, cur_network->network.mac_address);
@@ -1360,13 +1351,13 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)if (mac_id >=0 ) {u16 media_status; - media_status = (mac_id<<8 )|0 ;/* MACID|OPMODE:0 means disconnect */ + media_status = (mac_id <<8 ) |0 ;/* MACID|OPMODE:0 means disconnect */ /* for STA, AP, ADHOC mode, report disconnect stauts to FW */ rtw_hal_set_hwreg (adapter,HW_VAR_H2C_MEDIA_STATUS_RPT , (u8 *)&media_status); }/* if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) */ -if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_AP_STATE ) +if ((pmlmeinfo->state &0x03 ) ==WIFI_FW_AP_STATE )return ;mlmeext_sta_del_event_callback (adapter);
@@ -1416,8 +1407,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) }if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) || -check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) { - +check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) {rtw_free_stainfo (adapter, psta);if (adapter->stapriv.asoc_sta_count ==1 ) {/* a sta + bc/mc_stainfo (not Ibss_stainfo) */
@@ -1455,7 +1445,6 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)if (ret != _SUCCESS) goto unlock; } - } unlock:
@@ -1548,7 +1537,7 @@ void rtw_mlme_reset_auto_scan_int(struct adapter *adapter)if (pmlmeinfo->VHT_enable)/* disable auto scan when connect to 11AC AP */ mlme->auto_scan_int_ms =0 ;else if (adapter->registrypriv.wifi_spec &&is_client_associated_to_ap (adapter) == true) - mlme->auto_scan_int_ms =60 *1000 ; + mlme->auto_scan_int_ms =60 *1000 ;else if (rtw_chk_roam_flags (adapter,RTW_ROAM_ACTIVE )) {if (check_fwstate (mlme,WIFI_STATION_STATE ) &&check_fwstate (mlme, _FW_LINKED)) mlme->auto_scan_int_ms = mlme->roam_scan_int_ms;
@@ -1794,12 +1783,10 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) phead =get_list_head (queue);list_for_each (pmlmepriv->pscanned, phead) { - pnetwork =list_entry (pmlmepriv->pscanned, struct wlan_network, list);rtw_check_join_candidate (pmlmepriv, &candidate, pnetwork); - }if (!candidate) {
@@ -1961,11 +1948,10 @@ int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_break ; } - i += (in_ie[i+1 ]+2 );/* to the next IE element */ + i += (in_ie[i +1 ] +2 );/* to the next IE element */ }return ielength; - }/* */
@@ -1986,7 +1972,7 @@ static int SecIsInPMKIDList(struct adapter *Adapter, u8 *bssid)for (i =0 ; i <NUM_PMKID_CACHE ; i++)if ((p->PMKIDList[i].bUsed) && - (!memcmp (p->PMKIDList[i].Bssid, bssid,ETH_ALEN ))) + (!memcmp (p->PMKIDList[i].Bssid, bssid,ETH_ALEN )))return i;return -1 ; }
@@ -2035,7 +2021,7 @@ signed int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, u authmode =WLAN_EID_RSN ;if (check_fwstate (pmlmepriv,WIFI_UNDER_WPS )) { -memcpy (out_ie+ielength, psecuritypriv->wps_ie, psecuritypriv->wps_ie_len); +memcpy (out_ie + ielength, psecuritypriv->wps_ie, psecuritypriv->wps_ie_len); ielength += psecuritypriv->wps_ie_len; }else if ((authmode ==WLAN_EID_VENDOR_SPECIFIC ) || (authmode ==WLAN_EID_RSN )) {
@@ -2130,7 +2116,7 @@ void rtw_joinbss_reset(struct adapter *padapter)u8 threshold;struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct ht_priv *phtpriv = &pmlmepriv->htpriv; +struct ht_priv *phtpriv = &pmlmepriv->htpriv;/* todo: if you want to do something io/reg/hw setting before join_bss, please add code here */
@@ -2156,11 +2142,11 @@ void rtw_joinbss_reset(struct adapter *padapter)void rtw_ht_use_default_setting (struct adapter *padapter) { -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct ht_priv *phtpriv = &pmlmepriv->htpriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct ht_priv *phtpriv = &pmlmepriv->htpriv;struct registry_priv *pregistrypriv = &padapter->registrypriv; -bool bHwLDPCSupport = false, bHwSTBCSupport = false; -bool bHwSupportBeamformer = false, bHwSupportBeamformee = false; +bool bHwLDPCSupport = false, bHwSTBCSupport = false; +bool bHwSupportBeamformer = false, bHwSupportBeamformee = false;if (pregistrypriv->wifi_spec) phtpriv->bss_coexist =1 ;
@@ -2214,7 +2200,7 @@ void rtw_build_wmm_ie_ht(struct adapter *padapter, u8 *out_ie, uint *pout_len)if (padapter->mlmepriv.qospriv.qos_option ==0 ) { out_len = *pout_len; -rtw_set_ie (out_ie+out_len,WLAN_EID_VENDOR_SPECIFIC , +rtw_set_ie (out_ie + out_len,WLAN_EID_VENDOR_SPECIFIC , _WMM_IE_Length_,WMM_IE , pout_len); padapter->mlmepriv.qospriv.qos_option =1 ;
@@ -2232,7 +2218,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_u8 cbw40_enable =0 , stbc_rx_enable =0 , operation_bw =0 ;struct registry_priv *pregistrypriv = &padapter->registrypriv;struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct ht_priv *phtpriv = &pmlmepriv->htpriv; +struct ht_priv *phtpriv = &pmlmepriv->htpriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; phtpriv->ht_option = false;
@@ -2259,7 +2245,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ }else { p =rtw_get_ie (in_ie,WLAN_EID_HT_OPERATION , &ielen, in_len);if (p && (ielen ==sizeof (struct ieee80211_ht_addt_info ))) { -struct HT_info_element *pht_info = (struct HT_info_element *)(p+2 ); +struct HT_info_element *pht_info = (struct HT_info_element *)(p +2 );if (pht_info->infos[0 ] &BIT (2 )) {switch (pht_info->infos[0 ] &0x3 ) {
@@ -2327,14 +2313,14 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_rtw_hal_get_def_var (padapter,HW_VAR_MAX_RX_AMPDU_FACTOR , &max_rx_ampdu_factor); - ht_capie.ampdu_params_info = (max_rx_ampdu_factor&0x03 ); + ht_capie.ampdu_params_info = (max_rx_ampdu_factor &0x03 );if (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_) - ht_capie.ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY &(0x07 <<2 )); + ht_capie.ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY & (0x07 <<2 ));else - ht_capie.ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY &0x00 ); + ht_capie.ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY &0x00 ); -rtw_set_ie (out_ie+out_len,WLAN_EID_HT_CAPABILITY , +rtw_set_ie (out_ie + out_len,WLAN_EID_HT_CAPABILITY ,sizeof (struct ieee80211_ht_cap ), (unsigned char *)&ht_capie, pout_len); phtpriv->ht_option = true;
@@ -2343,12 +2329,11 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ p =rtw_get_ie (in_ie,WLAN_EID_HT_OPERATION , &ielen, in_len);if (p && (ielen ==sizeof (struct ieee80211_ht_addt_info ))) { out_len = *pout_len; -rtw_set_ie (out_ie+out_len,WLAN_EID_HT_OPERATION , ielen, p+2 , pout_len); +rtw_set_ie (out_ie + out_len,WLAN_EID_HT_OPERATION , ielen, p +2 , pout_len); } }return phtpriv->ht_option; - }/* the function is > passive_level (in critical_section) */
@@ -2379,12 +2364,11 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe p =rtw_get_ie (pie +sizeof (struct ndis_802_11_fix_ie ),WLAN_EID_HT_CAPABILITY , &len, ie_len -sizeof (struct ndis_802_11_fix_ie ));if (p && len >0 ) { - pht_capie = (struct ieee80211_ht_cap *)(p+2 ); + pht_capie = (struct ieee80211_ht_cap *)(p +2 ); max_ampdu_sz = (pht_capie->ampdu_params_info &IEEE80211_HT_CAP_AMPDU_FACTOR ); - max_ampdu_sz =1 << (max_ampdu_sz+3 );/* max_ampdu_sz (kbytes); */ + max_ampdu_sz =1 << (max_ampdu_sz +3 );/* max_ampdu_sz (kbytes); */ phtpriv->rx_ampdu_maxlen = max_ampdu_sz; - } len =0 ;
@@ -2473,21 +2457,20 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr phtpriv = &psta->htpriv;if (phtpriv->ht_option && phtpriv->ampdu_enable) { - issued = (phtpriv->agg_enable_bitmap>>priority)&0x1 ; - issued |= (phtpriv->candidate_tid_bitmap>>priority)&0x1 ; + issued = (phtpriv->agg_enable_bitmap >> priority) &0x1 ; + issued |= (phtpriv->candidate_tid_bitmap >> priority) &0x1 ;if (issued ==0 ) { psta->htpriv.candidate_tid_bitmap |=BIT ((u8 )priority); -rtw_addbareq_cmd (padapter, (u8 ) priority, pattrib->ra); +rtw_addbareq_cmd (padapter, (u8 )priority, pattrib->ra); } } - }void rtw_append_exented_cap (struct adapter *padapter,u8 *out_ie,uint *pout_len) {struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct ht_priv *phtpriv = &pmlmepriv->htpriv; +struct ht_priv *phtpriv = &pmlmepriv->htpriv;u8 cap_content[8 ] = {0 };if (phtpriv->bss_coexist)
@@ -2547,7 +2530,8 @@ void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network)signed int rtw_linked_check (struct adapter *padapter) {if ((check_fwstate (&padapter->mlmepriv,WIFI_AP_STATE ) == true) || - (check_fwstate (&padapter->mlmepriv,WIFI_ADHOC_STATE |WIFI_ADHOC_MASTER_STATE ) == true)) { + (check_fwstate (&padapter->mlmepriv, +WIFI_ADHOC_STATE |WIFI_ADHOC_MASTER_STATE ) == true)) {if (padapter->stapriv.asoc_sta_count >2 )return true; }else {/* Station mode */
Signature · 1 line
2.45.3
PATCH 4/4 staging: rtl8723bs: fixed comment styling
In reply to Ian ToComments were not neat and did not comply with the coding style.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 71 +++++++++++------------ 1 file changed, 35 insertions(+), 36 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +35 -36
@@ -185,10 +185,10 @@ void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network * }/* -return the wlan_network with the matching addr - -Shall be called under atomic context... to avoid possible racing condition... -*/ +* return the wlan_network with the matching addr +* +* Shall be called under atomic context... to avoid possible racing condition... +*/ struct wlan_network *_rtw_find_network (struct __queue *scanned_queue,u8 *addr) {struct list_head *phead, *plist;
@@ -290,10 +290,10 @@ void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network *pnet }/* -return the wlan_network with the matching addr - -Shall be called under atomic context... to avoid possible racing condition... -*/ +* return the wlan_network with the matching addr +* +* Shall be called under atomic context... to avoid possible racing condition... +*/ struct wlan_network *rtw_find_network (struct __queue *scanned_queue,u8 *addr) {struct wlan_network *pnetwork =_rtw_find_network (scanned_queue, addr);
@@ -483,11 +483,11 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *tif (!oldest ||time_after (oldest->last_scanned, pnetwork->last_scanned)) oldest = pnetwork; - }/* If we didn't find a match, then get a new network slot to initialize -* with this beacon's information */ +* with this beacon's information +*/ if (!target_find) {if (list_empty & pmlmepriv->free_bss_pool.queue) {/* If there are no more slots, expire the oldest */
@@ -564,11 +564,11 @@ void rtw_add_network(struct adapter *adapter, struct wlan_bssid_ex *pnetwork) }/* select the desired network based on the capability of the (i)bss. */ -/* check items: (1) security */ -/* (2) network_type */ -/* (3) WMM */ -/* (4) HT */ -/* (5) others */ +/* check items: (1) security */ +/* (2) network_type */ +/* (3) WMM */ +/* (4) HT */ +/* (5) others */ int rtw_is_desired_network (struct adapter *adapter,struct wlan_network *pnetwork);int rtw_is_desired_network (struct adapter *adapter,struct wlan_network *pnetwork) {
@@ -827,8 +827,8 @@ static void find_network(struct adapter *adapter) }/* -*rtw_free_assoc_resources: the caller has to lock pmlmepriv->lock -*/ +*rtw_free_assoc_resources: the caller has to lock pmlmepriv->lock +*/ void rtw_free_assoc_resources (struct adapter *adapter,int lock_scanned_queue) {struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@@ -863,8 +863,8 @@ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue) }/* -*rtw_indicate_connect: the caller has to lock pmlmepriv->lock -*/ +*rtw_indicate_connect: the caller has to lock pmlmepriv->lock +*/ void rtw_indicate_connect (struct adapter *padapter) {struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -882,8 +882,8 @@ void rtw_indicate_connect(struct adapter *padapter) }/* -*rtw_indicate_disconnect: the caller has to lock pmlmepriv->lock -*/ +*rtw_indicate_disconnect: the caller has to lock pmlmepriv->lock +*/ void rtw_indicate_disconnect (struct adapter *padapter) {struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -1466,9 +1466,9 @@ void rtw_wmm_event_callback(struct adapter *padapter, u8 *pbuf) }/* -* _rtw_join_timeout_handler - Timeout/failure handler for CMD JoinBss -* @adapter: pointer to struct adapter structure -*/ +* _rtw_join_timeout_handler - Timeout/failure handler for CMD JoinBss +* @adapter: pointer to struct adapter structure +*/ void _rtw_join_timeout_handler (struct timer_list *t) { struct adapter *adapter = from_timer(adapter, t,
@@ -1503,16 +1503,15 @@ void _rtw_join_timeout_handler(struct timer_list *t)/* indicate disconnect for the case that join_timeout and check_fwstate != FW_LINKED */ rtw_cfg80211_indicate_disconnect (adapter); - }spin_unlock_bh (&pmlmepriv->lock); }/* -* rtw_scan_timeout_handler - Timeout/Failure handler for CMD SiteSurvey -* @adapter: pointer to struct adapter structure -*/ +* rtw_scan_timeout_handler - Timeout/Failure handler for CMD SiteSurvey +* @adapter: pointer to struct adapter structure +*/ void rtw_scan_timeout_handler (struct timer_list *t) { struct adapter *adapter = from_timer(adapter, t,
@@ -1628,10 +1627,10 @@ void rtw_set_scan_deny(struct adapter *adapter, u32 ms) }/* -* Select a new roaming candidate from the original @param candidate and @param competitor -* @return true: candidate is updated -* @return false: candidate is not updated -*/ +* Select a new roaming candidate from the original @param candidate and @param competitor +* @return true: candidate is updated +* @return false: candidate is not updated +*/ static int rtw_check_roaming_candidate (struct mlme_priv *mlme ,struct wlan_network **candidate,struct wlan_network *competitor) {
@@ -1710,10 +1709,10 @@ int rtw_select_roaming_candidate(struct mlme_priv *mlme) }/* -* Select a new join candidate from the original @param candidate and @param competitor -* @return true: candidate is updated -* @return false: candidate is not updated -*/ +* Select a new join candidate from the original @param candidate and @param competitor +* @return true: candidate is updated +* @return false: candidate is not updated +*/ static int rtw_check_join_candidate (struct mlme_priv *mlme ,struct wlan_network **candidate,struct wlan_network *competitor) {
Signature · 1 line
2.45.3
Re: [PATCH 1/4] staging: rtl8723bs: remove unnecessary parentheses
In reply to Ian Todrivers/staging/rtl8723bs/core/rtw_mlme.c void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t · line 497
Quoted 6 lines · Ian To
drivers/staging/rtl8723bs/core/rtw_mlme.c +1
-1@@ -492,14 +494,14 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t/* If we didn't find a match, then get a new network slot to initialize * with this beacon's information */ if (!target_find) { -if (list_empty (&pmlmepriv->free_bss_pool.queue)) { +if (list_empty & pmlmepriv->free_bss_pool.queue) {
Nope.
regards,
dan carpetner
Re: [PATCH 1/4] staging: rtl8723bs: remove unnecessary parentheses
In reply to Ian Todrivers/staging/rtl8723bs/core/rtw_mlme.c void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, · line 461
Quoted 5 lines · Ian To
/*
drivers/staging/rtl8723bs/core/rtw_mlme.c +2
-2-Caller must hold pmlmepriv->lock first. -*/ +*Caller must hold pmlmepriv->lock first. +*/
This is unrelated.
Quoted 5 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +0
-1@@ -1745,24 +1746,24 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme }/* -Calling context:
drivers/staging/rtl8723bs/core/rtw_mlme.c static int rtw_check_join_candidate(struct mlme_priv *mlme · line 1754
Quoted 10 lines
drivers/staging/rtl8723bs/core/rtw_mlme.c +5
-4-The caller of the sub-routine will be in critical section... -The caller must hold the following spinlock -pmlmepriv->lock -*/ +*Calling context: +*The caller of the sub-routine will be in critical section... +*The caller must hold the following spinlock +*pmlmepriv->lock +*/
This is unrelated too.
regards,
dan carpenter