staging: rtl8188eu: cleanup comments in rtw_sta_mgt.c
PATCH 1/7 staging: rtl8188eu: cleanup comments in rtw_sta_mgt.c
Cleanup comments in rtw_sta_mgt.c to use kernel block comment style and not exceed 80 characters line length.
--- drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c +10 -5
@@ -199,10 +199,13 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) pstapriv->asoc_sta_count++;spin_unlock_bh (&pstapriv->sta_hash_lock); -/* Commented by Albert 2009/08/13 */ -/* For the SMC router, the sequence number of first packet of WPS handshake will be 0. */ -/* In this case, this packet will be dropped by recv_decache function if we use the 0x00 as the default value for tid_rxseq variable. */ -/* So, we initialize the tid_rxseq variable as the 0xffff. */ +/* Commented by Albert 2009/08/13 +* For the SMC router, the sequence number of first packet of +* WPS handshake will be 0. In this case, this packet will be +* dropped by recv_decache function if we use the 0x00 as the +* default value for tid_rxseq variable. So, we initialize the +* tid_rxseq variable as the 0xffff. +*/ for (i =0 ; i <16 ; i++)memcpy (&psta->sta_recvpriv.rxcache.tid_rxseq[i], &wRxSeqInitialValue,2 );
@@ -296,7 +299,9 @@ u32 rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta)del_timer_sync (&psta->addba_retry_timer); -/* for A-MPDU Rx reordering buffer control, cancel reordering_ctrl_timer */ +/* for A-MPDU Rx reordering buffer control, cancel +* reordering_ctrl_timer +*/ for (i =0 ; i <16 ; i++) {struct list_head *phead, *plist;struct recv_frame *prframe;
Signature · 1 line
2.23.0
PATCH 2/7 staging: rtl8188eu: convert unsigned char array to u8
Convert array bcast_addr from unsigned char to u8. Clears a line over 80 characters checkpatch warning.
--- drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c +1 -1
@@ -450,7 +450,7 @@ u32 rtw_init_bcmc_stainfo(struct adapter *padapter) {struct sta_info *psta;u32 res = _SUCCESS; -unsigned char bcast_addr[ETH_ALEN ] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff }; +u8 bcast_addr[ETH_ALEN ] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff };struct sta_priv *pstapriv = &padapter->stapriv; psta =rtw_alloc_stainfo (pstapriv, bcast_addr);
Signature · 1 line
2.23.0
PATCH 3/7 staging: rtl8188eu: rename array bcast_addr
In reply to Michael StraubeRename array bcast_addr to be more consistent in variable naming. In other places in this file buffers for broadcast addresses are named bc_addr as well.
bcast_addr -> bc_addr
--- drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c +2 -2
@@ -450,10 +450,10 @@ u32 rtw_init_bcmc_stainfo(struct adapter *padapter) {struct sta_info *psta;u32 res = _SUCCESS; -u8 bcast_addr[ETH_ALEN ] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff }; +u8 bc_addr[ETH_ALEN ] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff };struct sta_priv *pstapriv = &padapter->stapriv; - psta =rtw_alloc_stainfo (pstapriv, bcast_addr); + psta =rtw_alloc_stainfo (pstapriv, bc_addr);if (!psta) { res = _FAIL;
Signature · 1 line
2.23.0
PATCH 4/7 staging: rtl8188eu: convert rtw_access_ctrl to return bool
In reply to Michael StraubeFunction rtw_access_ctrl returns boolean values, so change the return type to bool. Also convert the local variables that are used for the return value from u8 to bool.
--- drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 6 +++--- drivers/staging/rtl8188eu/include/sta_info.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c +3 -3
@@ -476,13 +476,13 @@ struct sta_info *rtw_get_bcmc_stainfo(struct adapter *padapter)return rtw_get_stainfo (pstapriv, bc_addr); } -u8 rtw_access_ctrl (struct adapter *padapter,u8 *mac_addr) +bool rtw_access_ctrl (struct adapter *padapter,u8 *mac_addr) { -u8 res = true; +bool res = true;#ifdef CONFIG_88EU_AP_MODE struct list_head *plist, *phead;struct rtw_wlan_acl_node *paclnode; -u8 match = false; +bool match = false;struct sta_priv *pstapriv = &padapter->stapriv;struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;struct __queue *pacl_node_q = &pacl_list->acl_node_q;
drivers/staging/rtl8188eu/include/sta_info.h +1 -1
@@ -354,6 +354,6 @@ void rtw_free_all_stainfo(struct adapter *adapt);struct sta_info *rtw_get_stainfo (struct sta_priv *stapriv,u8 *hwaddr);u32 rtw_init_bcmc_stainfo (struct adapter *adapt);struct sta_info *rtw_get_bcmc_stainfo (struct adapter *padapter); -u8 rtw_access_ctrl (struct adapter *padapter,u8 *mac_addr); +bool rtw_access_ctrl (struct adapter *padapter,u8 *mac_addr);#endif /* _STA_INFO_H_ */
Signature · 1 line
2.23.0
PATCH 5/7 staging: rtl8188eu: remove ternary operator
In reply to Michael StraubeInstead of using ternary operator to set variable res, use the value of variable match (or the negation) directly to simplify the code and improve readability.
--- drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c +2 -2
@@ -504,9 +504,9 @@ bool rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr)spin_unlock_bh (&pacl_node_q->lock);if (pacl_list->mode ==1 )/* accept unless in deny list */ - res = (match) ? false : true; + res = !match;else if (pacl_list->mode ==2 )/* deny unless in accept list */ - res = (match) ? true : false; + res = match;else res = true;
Signature · 1 line
2.23.0
PATCH 6/7 staging: rtl8188eu: cleanup long lines in rtw_sta_mgt.c
In reply to Michael StraubeCleanup lines over 80 characters in rtw_sta_mgt.c by adding line breaks where appropriate.
--- drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c +10 -5
@@ -83,7 +83,8 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv)INIT_LIST_HEAD (&pstapriv->sta_hash[i]); -list_add_tail (&psta->list,get_list_head (&pstapriv->free_sta_queue)); +list_add_tail (&psta->list, +get_list_head (&pstapriv->free_sta_queue)); psta++; }
@@ -186,9 +187,11 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)_rtw_init_stainfo (psta);memcpy (psta->hwaddr, hwaddr,ETH_ALEN ); index =wifi_mac_hash (hwaddr); -RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_info_, ("%s: index=%x" , __func__, index)); +RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_info_, + ("%s: index=%x" , __func__, index));if (index >=NUM_STA ) { -RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_err_, ("ERROR => %s: index >= NUM_STA" , __func__)); +RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_err_, + ("ERROR => %s: index >= NUM_STA" , __func__)); psta =NULL ; goto exit; }
@@ -208,7 +211,8 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)*/ for (i =0 ; i <16 ; i++) -memcpy (&psta->sta_recvpriv.rxcache.tid_rxseq[i], &wRxSeqInitialValue,2 ); +memcpy (&psta->sta_recvpriv.rxcache.tid_rxseq[i], + &wRxSeqInitialValue,2 ); RT_TRACE(_module_rtl871x_sta_mgt_c_, _drv_info_, ("alloc number_%d stainfo with hwaddr = %pM\n",
@@ -457,7 +461,8 @@ u32 rtw_init_bcmc_stainfo(struct adapter *padapter)if (!psta) { res = _FAIL; -RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_err_, ("rtw_alloc_stainfo fail" )); +RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_err_, + ("rtw_alloc_stainfo fail" )); goto exit; }
Signature · 1 line
2.23.0
PATCH 7/7 staging: rtl8188eu: reduce indentation level in rtw_alloc_stainfo
In reply to Michael StraubeRemove else-arm from if-else statement. Move the else code out of the if-else and skip it by adding goto exit to the if block. The exit label was directly after the else-arm, so there is no change in behaviour. Reduces indentation level and clears a line over 80 characters checkpatch warning.
--- drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 101 ++++++++++--------- 1 file changed, 51 insertions(+), 50 deletions(-)
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c +51 -50
@@ -181,70 +181,71 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) struct sta_info, list);if (!psta) {spin_unlock_bh (&pfree_sta_queue->lock); - }else { -list_del_init (&psta->list); -spin_unlock_bh (&pfree_sta_queue->lock); -_rtw_init_stainfo (psta); -memcpy (psta->hwaddr, hwaddr,ETH_ALEN ); - index =wifi_mac_hash (hwaddr); -RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_info_, - ("%s: index=%x" , __func__, index)); -if (index >=NUM_STA ) { -RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_err_, - ("ERROR => %s: index >= NUM_STA" , __func__)); - psta =NULL ; - goto exit; - } - phash_list = &pstapriv->sta_hash[index]; - -spin_lock_bh (&pstapriv->sta_hash_lock); -list_add_tail (&psta->hash_list, phash_list); - pstapriv->asoc_sta_count++; -spin_unlock_bh (&pstapriv->sta_hash_lock); + goto exit; + } -/* Commented by Albert 2009/08/13 -* For the SMC router, the sequence number of first packet of -* WPS handshake will be 0. In this case, this packet will be -* dropped by recv_decache function if we use the 0x00 as the -* default value for tid_rxseq variable. So, we initialize the -* tid_rxseq variable as the 0xffff. -*/ +list_del_init (&psta->list); +spin_unlock_bh (&pfree_sta_queue->lock); +_rtw_init_stainfo (psta); +memcpy (psta->hwaddr, hwaddr,ETH_ALEN ); + index =wifi_mac_hash (hwaddr); +RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_info_, + ("%s: index=%x" , __func__, index)); +if (index >=NUM_STA ) { +RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_err_, + ("ERROR => %s: index >= NUM_STA" , __func__)); + psta =NULL ; + goto exit; + } + phash_list = &pstapriv->sta_hash[index]; -for (i =0 ; i <16 ; i++) -memcpy (&psta->sta_recvpriv.rxcache.tid_rxseq[i], - &wRxSeqInitialValue,2 ); +spin_lock_bh (&pstapriv->sta_hash_lock); +list_add_tail (&psta->hash_list, phash_list); + pstapriv->asoc_sta_count++; +spin_unlock_bh (&pstapriv->sta_hash_lock); -RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_info_, - ("alloc number_%d stainfo with hwaddr = %pM\n" , - pstapriv->asoc_sta_count, hwaddr)); +/* Commented by Albert 2009/08/13 +* For the SMC router, the sequence number of first packet of +* WPS handshake will be 0. In this case, this packet will be +* dropped by recv_decache function if we use the 0x00 as the +* default value for tid_rxseq variable. So, we initialize the +* tid_rxseq variable as the 0xffff. +*/ -init_addba_retry_timer (pstapriv->padapter, psta); +for (i =0 ; i <16 ; i++) +memcpy (&psta->sta_recvpriv.rxcache.tid_rxseq[i], + &wRxSeqInitialValue,2 ); -/* for A-MPDU Rx reordering buffer control */ -for (i =0 ; i <16 ; i++) { - preorder_ctrl = &psta->recvreorder_ctrl[i]; +RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_info_, + ("alloc number_%d stainfo with hwaddr = %pM\n" , + pstapriv->asoc_sta_count, hwaddr)); - preorder_ctrl->padapter = pstapriv->padapter; +init_addba_retry_timer (pstapriv->padapter, psta); - preorder_ctrl->enable = false; +/* for A-MPDU Rx reordering buffer control */ +for (i =0 ; i <16 ; i++) { + preorder_ctrl = &psta->recvreorder_ctrl[i]; - preorder_ctrl->indicate_seq =0xffff ; - preorder_ctrl->wend_b =0xffff ; - preorder_ctrl->wsize_b =64 ;/* 64; */ + preorder_ctrl->padapter = pstapriv->padapter; -_rtw_init_queue (&preorder_ctrl->pending_recvframe_queue); + preorder_ctrl->enable = false; -rtw_init_recv_timer (preorder_ctrl); - } + preorder_ctrl->indicate_seq =0xffff ; + preorder_ctrl->wend_b =0xffff ; + preorder_ctrl->wsize_b =64 ;/* 64; */ -/* init for DM */ - psta->rssi_stat.UndecoratedSmoothedPWDB =-1 ; - psta->rssi_stat.UndecoratedSmoothedCCK =-1 ; +_rtw_init_queue (&preorder_ctrl->pending_recvframe_queue); -/* init for the sequence number of received management frame */ - psta->RxMgmtFrameSeqNum =0xffff ; +rtw_init_recv_timer (preorder_ctrl); } +/* init for DM */ + psta->rssi_stat.UndecoratedSmoothedPWDB =-1 ; + psta->rssi_stat.UndecoratedSmoothedCCK =-1 ; + +/* init for the sequence number of received management frame */ + psta->RxMgmtFrameSeqNum =0xffff ; + exit:return psta; }
Signature · 1 line
2.23.0
Re: [PATCH 7/7] staging: rtl8188eu: reduce indentation level in rtw_alloc_stainfo
Quoted 5 lines · Michael Straube
Remove else-arm from if-else statement. Move the else code out of the if-else and skip it by adding goto exit to the if block. The exit label was directly after the else-arm, so there is no change in behaviour. Reduces indentation level and clears a line over 80 characters checkpatch warning.
[]
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
Quoted 1 line
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c +0
-0
[]
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) · line 183
Quoted 4 lines
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c +0
-0@@ -181,70 +181,71 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) struct sta_info, list);if (!psta) {spin_unlock_bh (&pfree_sta_queue->lock);
Because exit does no cleanup, it's probably simpler as
return NULL;
and then remove the exit label
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) · line 198
Quoted 5 lines
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c +5
-0+if (index >=NUM_STA ) { +RT_TRACE (_module_rtl871x_sta_mgt_c_, _drv_err_, + ("ERROR => %s: index >= NUM_STA" , __func__)); + psta =NULL ; + goto exit;
here too
[]
Quoted 4 lines
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c +1
-0+ exit:return psta; }