Re: [PATCH 3/4] staging: rtl8723bs: core: reorganize characters so the lines are under 100 ch

2021-04-06 Thread Beatriz Martins de Carvalho 



Em 06/04/21 13:13, Greg KH escreveu:

On Mon, Apr 05, 2021 at 06:29:19PM +0100, Beatriz Martins de Carvalho wrote:

Cleans up warnings of "line over 100 characters" but avoinding
more than 90 characters in file rtw_ap.c

Signed-off-by: Beatriz Martins de Carvalho 
---
  drivers/staging/rtl8723bs/core/rtw_ap.c | 22 ++
  1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c 
b/drivers/staging/rtl8723bs/core/rtw_ap.c
index 4dab4d741675..ca6fec52d213 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ap.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
@@ -278,11 +278,13 @@ void expire_timeout_chk(struct adapter *padapter)
  
  			if (psta->state & WIFI_SLEEP_STATE) {

if (!(psta->state & WIFI_STA_ALIVE_CHK_STATE)) {
-   /* to check if alive by another methods 
if station is at ps mode. */
+   /* to check if alive by another methods 
*/
+   /* if station is at ps mode. */
psta->expire_to = pstapriv->expire_to;
psta->state |= WIFI_STA_ALIVE_CHK_STATE;
  
-	/* DBG_871X("alive chk, sta:%pM is at ps mode!\n", MAC_ARG(psta->hwaddr)); */

+   /* DBG_871X("alive chk, sta:%pM is at 
ps */
+   /* mode!\n", MAC_ARG(psta->hwaddr)); */

You just wrapped a code line :(

Just remove it, it's not needed.

Sorry! Yesterday I didn't realize that it was a code line. I will remove it.



  
  	/* to update bcn with tim_bitmap for this station */

pstapriv->tim_bitmap |= BIT(psta->aid);
@@ -309,7 +311,8 @@ void expire_timeout_chk(struct adapter *padapter)
);
updated = ap_free_sta(padapter, psta, false, 
WLAN_REASON_DEAUTH_LEAVING);
} else {
-   /* TODO: Aging mechanism to digest frames in sleep_q to 
avoid running out of xmitframe */
+   /* TODO: Aging mechanism to digest frames in sleep_q to 
*/
+   /* avoid running out of xmitframe */
if (psta->sleepq_len > (NR_XMITFRAME / 
pstapriv->asoc_list_cnt)
&& padapter->xmitpriv.free_xmitframe_cnt < ((
NR_XMITFRAME / pstapriv->asoc_list_cnt
@@ -375,7 +378,8 @@ void expire_timeout_chk(struct adapter *padapter)
if (list_empty(>asoc_list) == false) {
list_del_init(>asoc_list);
pstapriv->asoc_list_cnt--;
-   updated = ap_free_sta(padapter, psta, false, 
WLAN_REASON_DEAUTH_LEAVING);
+   updated = ap_free_sta(padapter, psta, false,
+ 
WLAN_REASON_DEAUTH_LEAVING);
}
spin_unlock_bh(>asoc_list_lock);
}
@@ -469,7 +473,8 @@ void update_bmc_sta(struct adapter *padapter)
  
  		memset((void *)>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. */

Again, look at what you are changing to see if it makes sense.

Yesterday had to make sense, but now I saw that was wrong. I will remove it.
  
  		/* prepare for add_RATid */

supportRateNum = rtw_get_rateset_len((u8 
*)_network->SupportedRates);
@@ -748,8 +753,8 @@ void start_bss_network(struct adapter *padapter, u8 *pbuf)
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, */
-   /* and at first time the security ie (RSN/WPA IE) will not include in 
beacon. */
+   /* 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. */

These changes do not look correct, you made them longer?


No, I only rearranged the block comment, where I sent the last word in 
the sentence to the next line,


and with that, each sentence stays with less than 100 characters. But I 
will remove it.




thanks,

Thank you for to review, once more I will have more attention to my changes.

greg k-h

Beatriz Martins de Carvalho

Re: [PATCH 3/4] staging: rtl8723bs: core: reorganize characters so the lines are under 100 ch

2021-04-06 Thread Greg KH 
On Mon, Apr 05, 2021 at 06:29:19PM +0100, Beatriz Martins de Carvalho wrote:
> Cleans up warnings of "line over 100 characters" but avoinding
> more than 90 characters in file rtw_ap.c
> 
> Signed-off-by: Beatriz Martins de Carvalho 
> 
> ---
>  drivers/staging/rtl8723bs/core/rtw_ap.c | 22 ++
>  1 file changed, 14 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c 
> b/drivers/staging/rtl8723bs/core/rtw_ap.c
> index 4dab4d741675..ca6fec52d213 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_ap.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
> @@ -278,11 +278,13 @@ void expire_timeout_chk(struct adapter *padapter)
>  
>   if (psta->state & WIFI_SLEEP_STATE) {
>   if (!(psta->state & WIFI_STA_ALIVE_CHK_STATE)) {
> - /* to check if alive by another methods 
> if station is at ps mode. */
> + /* to check if alive by another methods 
> */
> + /* if station is at ps mode. */
>   psta->expire_to = pstapriv->expire_to;
>   psta->state |= WIFI_STA_ALIVE_CHK_STATE;
>  
> - /* DBG_871X("alive chk, sta:%pM is at 
> ps mode!\n", MAC_ARG(psta->hwaddr)); */
> + /* DBG_871X("alive chk, sta:%pM is at 
> ps */
> + /* mode!\n", MAC_ARG(psta->hwaddr)); */

You just wrapped a code line :(

Just remove it, it's not needed.


>  
>   /* to update bcn with tim_bitmap for 
> this station */
>   pstapriv->tim_bitmap |= BIT(psta->aid);
> @@ -309,7 +311,8 @@ void expire_timeout_chk(struct adapter *padapter)
>   );
>   updated = ap_free_sta(padapter, psta, false, 
> WLAN_REASON_DEAUTH_LEAVING);
>   } else {
> - /* TODO: Aging mechanism to digest frames in sleep_q to 
> avoid running out of xmitframe */
> + /* TODO: Aging mechanism to digest frames in sleep_q to 
> */
> + /* avoid running out of xmitframe */
>   if (psta->sleepq_len > (NR_XMITFRAME / 
> pstapriv->asoc_list_cnt)
>   && padapter->xmitpriv.free_xmitframe_cnt < ((
>   NR_XMITFRAME / pstapriv->asoc_list_cnt
> @@ -375,7 +378,8 @@ void expire_timeout_chk(struct adapter *padapter)
>   if (list_empty(>asoc_list) == false) {
>   list_del_init(>asoc_list);
>   pstapriv->asoc_list_cnt--;
> - updated = ap_free_sta(padapter, psta, false, 
> WLAN_REASON_DEAUTH_LEAVING);
> + updated = ap_free_sta(padapter, psta, false,
> +   
> WLAN_REASON_DEAUTH_LEAVING);
>   }
>   spin_unlock_bh(>asoc_list_lock);
>   }
> @@ -469,7 +473,8 @@ void update_bmc_sta(struct adapter *padapter)
>  
>   memset((void *)>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. */

Again, look at what you are changing to see if it makes sense.

>  
>   /* prepare for add_RATid */
>   supportRateNum = rtw_get_rateset_len((u8 
> *)_network->SupportedRates);
> @@ -748,8 +753,8 @@ void start_bss_network(struct adapter *padapter, u8 *pbuf)
>   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, */
> - /* and at first time the security ie (RSN/WPA IE) will not include in 
> beacon. */
> + /* 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. */

These changes do not look correct, you made them longer?

thanks,

greg k-h

[PATCH 3/4] staging: rtl8723bs: core: reorganize characters so the lines are under 100 ch

2021-04-05 Thread Beatriz Martins de Carvalho 
Cleans up warnings of "line over 100 characters" but avoinding
more than 90 characters in file rtw_ap.c

Signed-off-by: Beatriz Martins de Carvalho 
---
 drivers/staging/rtl8723bs/core/rtw_ap.c | 22 ++
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c 
b/drivers/staging/rtl8723bs/core/rtw_ap.c
index 4dab4d741675..ca6fec52d213 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ap.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
@@ -278,11 +278,13 @@ void expire_timeout_chk(struct adapter *padapter)
 
if (psta->state & WIFI_SLEEP_STATE) {
if (!(psta->state & WIFI_STA_ALIVE_CHK_STATE)) {
-   /* to check if alive by another methods 
if station is at ps mode. */
+   /* to check if alive by another methods 
*/
+   /* if station is at ps mode. */
psta->expire_to = pstapriv->expire_to;
psta->state |= WIFI_STA_ALIVE_CHK_STATE;
 
-   /* DBG_871X("alive chk, sta:%pM is at 
ps mode!\n", MAC_ARG(psta->hwaddr)); */
+   /* DBG_871X("alive chk, sta:%pM is at 
ps */
+   /* mode!\n", MAC_ARG(psta->hwaddr)); */
 
/* to update bcn with tim_bitmap for 
this station */
pstapriv->tim_bitmap |= BIT(psta->aid);
@@ -309,7 +311,8 @@ void expire_timeout_chk(struct adapter *padapter)
);
updated = ap_free_sta(padapter, psta, false, 
WLAN_REASON_DEAUTH_LEAVING);
} else {
-   /* TODO: Aging mechanism to digest frames in sleep_q to 
avoid running out of xmitframe */
+   /* TODO: Aging mechanism to digest frames in sleep_q to 
*/
+   /* avoid running out of xmitframe */
if (psta->sleepq_len > (NR_XMITFRAME / 
pstapriv->asoc_list_cnt)
&& padapter->xmitpriv.free_xmitframe_cnt < ((
NR_XMITFRAME / pstapriv->asoc_list_cnt
@@ -375,7 +378,8 @@ void expire_timeout_chk(struct adapter *padapter)
if (list_empty(>asoc_list) == false) {
list_del_init(>asoc_list);
pstapriv->asoc_list_cnt--;
-   updated = ap_free_sta(padapter, psta, false, 
WLAN_REASON_DEAUTH_LEAVING);
+   updated = ap_free_sta(padapter, psta, false,
+ 
WLAN_REASON_DEAUTH_LEAVING);
}
spin_unlock_bh(>asoc_list_lock);
}
@@ -469,7 +473,8 @@ void update_bmc_sta(struct adapter *padapter)
 
memset((void *)>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 
*)_network->SupportedRates);
@@ -748,8 +753,8 @@ void start_bss_network(struct adapter *padapter, u8 *pbuf)
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, */
-   /* and at first time the security ie (RSN/WPA IE) will not include in 
beacon. */
+   /* 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->IELength - _FIXED_IE_LENGTH_, NULL, NULL))
pmlmeext->bstart_bss = true;
@@ -1117,7 +1122,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 
*pbuf,  int len)
 
*(p + 8) |= BIT(7);/* QoS Info, support U-APSD 
*/
 
-   /* disable all ACM bits since the WMM admission 
control is not supported */
+   /* disable all ACM bits since the WMM admission 
*/
+   /* control is not supported */
*(p + 10) &= ~BIT(4); /* BE */
*(p + 14) &= ~BIT(4); /* BK */
*(p + 18) &= ~BIT(4); /* VI */
-- 
2.25.1