staging: rtl8723bs: fix comparison order in rtw_ieee80211.c

[PATCH] staging: rtl8723bs: fix comparison order in rtw_ieee80211.c

Posted by Anubhav Kokane 3 weeks, 6 days ago

Fix checkpatch warning: "Comparisons should place the constant on the
right side of the test".

Move the constant _SUCCESS to the right side of the comparison
operator.

Also fix whitespace around binary operator '+' and wrap lines to fit
coding style limits.

Signed-off-by: Anubhav Kokane <dev.anubhavk@gmail.com>
---
 drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
index 8fdeeda88..f45ae5d5f 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
@@ -1009,7 +1009,8 @@ static int rtw_get_cipher_info(struct wlan_network *pnetwork)
 	pbuf = rtw_get_wpa_ie(&pnetwork->network.ies[12], &wpa_ielen, pnetwork->network.ie_length-12);
 
 	if (pbuf && (wpa_ielen > 0)) {
-		if (_SUCCESS == rtw_parse_wpa_ie(pbuf, wpa_ielen+2, &group_cipher, &pairwise_cipher, &is8021x)) {
+		if (rtw_parse_wpa_ie(pbuf, wpa_ielen + 2, &group_cipher,
+				     &pairwise_cipher, &is8021x) == _SUCCESS) {
 			pnetwork->bcn_info.pairwise_cipher = pairwise_cipher;
 			pnetwork->bcn_info.group_cipher = group_cipher;
 			pnetwork->bcn_info.is_8021x = is8021x;
@@ -1019,7 +1020,8 @@ static int rtw_get_cipher_info(struct wlan_network *pnetwork)
 		pbuf = rtw_get_wpa2_ie(&pnetwork->network.ies[12], &wpa_ielen, pnetwork->network.ie_length-12);
 
 		if (pbuf && (wpa_ielen > 0)) {
-			if (_SUCCESS == rtw_parse_wpa2_ie(pbuf, wpa_ielen+2, &group_cipher, &pairwise_cipher, &is8021x)) {
+			if (rtw_parse_wpa2_ie(pbuf, wpa_ielen + 2, &group_cipher,
+					      &pairwise_cipher, &is8021x) == _SUCCESS) {
 				pnetwork->bcn_info.pairwise_cipher = pairwise_cipher;
 				pnetwork->bcn_info.group_cipher = group_cipher;
 				pnetwork->bcn_info.is_8021x = is8021x;
-- 
2.43.0

Re: [PATCH] staging: rtl8723bs: fix comparison order in rtw_ieee80211.c

Posted by Greg KH 3 weeks, 6 days ago

On Sun, Jan 11, 2026 at 09:00:34AM +0000, Anubhav Kokane wrote:
> Fix checkpatch warning: "Comparisons should place the constant on the
> right side of the test".
> 
> Move the constant _SUCCESS to the right side of the comparison
> operator.
> 
> Also fix whitespace around binary operator '+' and wrap lines to fit
> coding style limits.
> 
> Signed-off-by: Anubhav Kokane <dev.anubhavk@gmail.com>
> ---
>  drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
> index 8fdeeda88..f45ae5d5f 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
> @@ -1009,7 +1009,8 @@ static int rtw_get_cipher_info(struct wlan_network *pnetwork)
>  	pbuf = rtw_get_wpa_ie(&pnetwork->network.ies[12], &wpa_ielen, pnetwork->network.ie_length-12);
>  
>  	if (pbuf && (wpa_ielen > 0)) {
> -		if (_SUCCESS == rtw_parse_wpa_ie(pbuf, wpa_ielen+2, &group_cipher, &pairwise_cipher, &is8021x)) {
> +		if (rtw_parse_wpa_ie(pbuf, wpa_ielen + 2, &group_cipher,
> +				     &pairwise_cipher, &is8021x) == _SUCCESS) {
>  			pnetwork->bcn_info.pairwise_cipher = pairwise_cipher;
>  			pnetwork->bcn_info.group_cipher = group_cipher;
>  			pnetwork->bcn_info.is_8021x = is8021x;
> @@ -1019,7 +1020,8 @@ static int rtw_get_cipher_info(struct wlan_network *pnetwork)
>  		pbuf = rtw_get_wpa2_ie(&pnetwork->network.ies[12], &wpa_ielen, pnetwork->network.ie_length-12);
>  
>  		if (pbuf && (wpa_ielen > 0)) {
> -			if (_SUCCESS == rtw_parse_wpa2_ie(pbuf, wpa_ielen+2, &group_cipher, &pairwise_cipher, &is8021x)) {
> +			if (rtw_parse_wpa2_ie(pbuf, wpa_ielen + 2, &group_cipher,
> +					      &pairwise_cipher, &is8021x) == _SUCCESS) {
>  				pnetwork->bcn_info.pairwise_cipher = pairwise_cipher;
>  				pnetwork->bcn_info.group_cipher = group_cipher;
>  				pnetwork->bcn_info.is_8021x = is8021x;
> -- 
> 2.43.0
> 
> 

Does not apply to my tree anymore, due to someone else sending this
same change right before you did, sorry.

greg k-h