staging: rtl8723bs: fix spaces around binary operators

Add missing spaces and fix line length to comply with kernel coding
style.

Signed-off-by: Nikolay Kulikov <nikolayof23@gmail.com>
Reviewed-by: Ethan Tidmore <ethantidmore06@gmail.com>
Link: https://patch.msgid.link/20260221172751.52329-1-nikolayof23@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
index d40bc436743b57e6a85ea4ebc96ad113e7e12d5c..605c32fd2e88165af16f59c9ef23a1d3a2279449 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
@@ -187,19 +187,19 @@ u8 *rtw_get_ie_ex(u8 *in_ie, uint in_len, u8 eid, u8 *oui, u8 oui_len, u8 *ie, u
        cnt = 0;
 
        while (cnt < in_len) {
-               if (eid == in_ie[cnt]
-                       && (!oui || !memcmp(&in_ie[cnt+2], oui, oui_len))) {
+               if (eid == in_ie[cnt] &&
+                   (!oui || !memcmp(&in_ie[cnt + 2], oui, oui_len))) {
                        target_ie = &in_ie[cnt];
 
                        if (ie)
-                               memcpy(ie, &in_ie[cnt], in_ie[cnt+1]+2);
+                               memcpy(ie, &in_ie[cnt], in_ie[cnt + 1] + 2);
 
                        if (ielen)
-                               *ielen = in_ie[cnt+1]+2;
+                               *ielen = in_ie[cnt + 1] + 2;
 
                        break;
                }
-               cnt += in_ie[cnt+1]+2; /* goto next */
+               cnt += in_ie[cnt + 1] + 2; /* goto next */
        }
 
        return target_ie;
@@ -450,10 +450,10 @@ int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwis
                return _FAIL;
        }
 
-       if ((*wpa_ie != WLAN_EID_VENDOR_SPECIFIC) || (*(wpa_ie+1) != (u8)(wpa_ie_len - 2)) ||
-          (memcmp(wpa_ie+2, RTW_WPA_OUI_TYPE, WPA_SELECTOR_LEN))) {
+       if ((*wpa_ie != WLAN_EID_VENDOR_SPECIFIC) ||
+           (*(wpa_ie + 1) != (u8)(wpa_ie_len - 2)) ||
+           (memcmp(wpa_ie + 2, RTW_WPA_OUI_TYPE, WPA_SELECTOR_LEN)))
                return _FAIL;
-       }
 
        pos = wpa_ie;
 
@@ -513,7 +513,7 @@ int rtw_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwi
                return _FAIL;
        }
 
-       if ((*rsn_ie != WLAN_EID_RSN) || (*(rsn_ie+1) != (u8)(rsn_ie_len - 2)))
+       if ((*rsn_ie != WLAN_EID_RSN) || (*(rsn_ie + 1) != (u8)(rsn_ie_len - 2)))
                return _FAIL;
 
        pos = rsn_ie;
@@ -580,18 +580,18 @@ int rtw_get_wapi_ie(u8 *in_ie, uint in_len, u8 *wapi_ie, u16 *wapi_len)
        while (cnt < in_len) {
                authmode = in_ie[cnt];
 
-               /* if (authmode == WLAN_EID_BSS_AC_ACCESS_DELAY) */
-               if (authmode == WLAN_EID_BSS_AC_ACCESS_DELAY && (!memcmp(&in_ie[cnt+6], wapi_oui1, 4) ||
-                                       !memcmp(&in_ie[cnt+6], wapi_oui2, 4))) {
+               if (authmode == WLAN_EID_BSS_AC_ACCESS_DELAY &&
+                   (!memcmp(&in_ie[cnt + 6], wapi_oui1, 4) ||
+                    !memcmp(&in_ie[cnt + 6], wapi_oui2, 4))) {
                        if (wapi_ie)
-                               memcpy(wapi_ie, &in_ie[cnt], in_ie[cnt+1]+2);
+                               memcpy(wapi_ie, &in_ie[cnt], in_ie[cnt + 1] + 2);
 
                        if (wapi_len)
-                               *wapi_len = in_ie[cnt+1]+2;
+                               *wapi_len = in_ie[cnt + 1] + 2;
 
-                       cnt += in_ie[cnt+1]+2;  /* get next */
+                       cnt += in_ie[cnt + 1] + 2;  /* get next */
                } else {
-                       cnt += in_ie[cnt+1]+2;   /* get next */
+                       cnt += in_ie[cnt + 1] + 2;   /* get next */
                }
        }
 
@@ -614,9 +614,10 @@ void rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie
        while (cnt < in_len) {
                authmode = in_ie[cnt];
 
-               if ((authmode == WLAN_EID_VENDOR_SPECIFIC) && (!memcmp(&in_ie[cnt+2], &wpa_oui[0], 4))) {
+               if ((authmode == WLAN_EID_VENDOR_SPECIFIC) &&
+                   (!memcmp(&in_ie[cnt + 2], &wpa_oui[0], 4))) {
                        if (wpa_ie)
-                               memcpy(wpa_ie, &in_ie[cnt], in_ie[cnt+1]+2);
+                               memcpy(wpa_ie, &in_ie[cnt], in_ie[cnt + 1] + 2);
 
                        *wpa_len = in_ie[cnt + 1] + 2;
                        cnt += in_ie[cnt + 1] + 2;  /* get next */
@@ -625,10 +626,10 @@ void rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie
                                if (rsn_ie)
                                        memcpy(rsn_ie, &in_ie[cnt], in_ie[cnt + 1] + 2);
 
-                               *rsn_len = in_ie[cnt+1]+2;
-                               cnt += in_ie[cnt+1]+2;  /* get next */
+                               *rsn_len = in_ie[cnt + 1] + 2;
+                               cnt += in_ie[cnt + 1] + 2;  /* get next */
                        } else {
-                               cnt += in_ie[cnt+1]+2;   /* get next */
+                               cnt += in_ie[cnt + 1] + 2;   /* get next */
                        }
                }
        }
@@ -660,20 +661,20 @@ u8 *rtw_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen)
        while (cnt < in_len) {
                eid = in_ie[cnt];
 
-               if ((eid == WLAN_EID_VENDOR_SPECIFIC) && (!memcmp(&in_ie[cnt+2], wps_oui, 4))) {
+               if ((eid == WLAN_EID_VENDOR_SPECIFIC) && (!memcmp(&in_ie[cnt + 2], wps_oui, 4))) {
                        wpsie_ptr = &in_ie[cnt];
 
                        if (wps_ie)
-                               memcpy(wps_ie, &in_ie[cnt], in_ie[cnt+1]+2);
+                               memcpy(wps_ie, &in_ie[cnt], in_ie[cnt + 1] + 2);
 
                        if (wps_ielen)
-                               *wps_ielen = in_ie[cnt+1]+2;
+                               *wps_ielen = in_ie[cnt + 1] + 2;
 
-                       cnt += in_ie[cnt+1]+2;
+                       cnt += in_ie[cnt + 1] + 2;
 
                        break;
                }
-               cnt += in_ie[cnt+1]+2; /* goto next */
+               cnt += in_ie[cnt + 1] + 2; /* goto next */
        }
 
        return wpsie_ptr;
@@ -751,12 +752,12 @@ u8 *rtw_get_wps_attr_content(u8 *wps_ie, uint wps_ielen, u16 target_attr_id, u8
 
        if (attr_ptr && attr_len) {
                if (buf_content)
-                       memcpy(buf_content, attr_ptr+4, attr_len-4);
+                       memcpy(buf_content, attr_ptr + 4, attr_len - 4);
 
                if (len_content)
-                       *len_content = attr_len-4;
+                       *len_content = attr_len - 4;
 
-               return attr_ptr+4;
+               return attr_ptr + 4;
        }
 
        return NULL;
@@ -1007,20 +1008,25 @@ static int rtw_get_cipher_info(struct wlan_network *pnetwork)
        int group_cipher = 0, pairwise_cipher = 0, is8021x = 0;
        int ret = _FAIL;
 
-       pbuf = rtw_get_wpa_ie(&pnetwork->network.ies[12], &wpa_ielen, pnetwork->network.ie_length-12);
+       pbuf = rtw_get_wpa_ie(&pnetwork->network.ies[12],
+                             &wpa_ielen,
+                             pnetwork->network.ie_length - 12);
 
        if (pbuf && (wpa_ielen > 0)) {
-               if (rtw_parse_wpa_ie(pbuf, wpa_ielen+2, &group_cipher, &pairwise_cipher, &is8021x) == _SUCCESS) {
+               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;
                        ret = _SUCCESS;
                }
        } else {
-               pbuf = rtw_get_wpa2_ie(&pnetwork->network.ies[12], &wpa_ielen, pnetwork->network.ie_length-12);
+               pbuf = rtw_get_wpa2_ie(&pnetwork->network.ies[12], &wpa_ielen,
+                                      pnetwork->network.ie_length - 12);
 
                if (pbuf && (wpa_ielen > 0)) {
-                       if (rtw_parse_wpa2_ie(pbuf, wpa_ielen+2, &group_cipher, &pairwise_cipher, &is8021x) == _SUCCESS) {
+                       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;
@@ -1089,21 +1095,21 @@ u16 rtw_mcs_rate(u8 bw_40MHz, u8 short_GI, unsigned char *MCS_rate)
        u16 max_rate = 0;
 
        if (MCS_rate[0] & BIT(7))
-               max_rate = (bw_40MHz) ? ((short_GI)?1500:1350):((short_GI)?722:650);
+               max_rate = (bw_40MHz) ? ((short_GI) ? 1500 : 1350) : ((short_GI) ? 722 : 650);
        else if (MCS_rate[0] & BIT(6))
-               max_rate = (bw_40MHz) ? ((short_GI)?1350:1215):((short_GI)?650:585);
+               max_rate = (bw_40MHz) ? ((short_GI) ? 1350 : 1215) : ((short_GI) ? 650 : 585);
        else if (MCS_rate[0] & BIT(5))
-               max_rate = (bw_40MHz) ? ((short_GI)?1200:1080):((short_GI)?578:520);
+               max_rate = (bw_40MHz) ? ((short_GI) ? 1200 : 1080) : ((short_GI) ? 578 : 520);
        else if (MCS_rate[0] & BIT(4))
-               max_rate = (bw_40MHz) ? ((short_GI)?900:810):((short_GI)?433:390);
+               max_rate = (bw_40MHz) ? ((short_GI) ? 900 : 810) : ((short_GI) ? 433 : 390);
        else if (MCS_rate[0] & BIT(3))
-               max_rate = (bw_40MHz) ? ((short_GI)?600:540):((short_GI)?289:260);
+               max_rate = (bw_40MHz) ? ((short_GI) ? 600 : 540) : ((short_GI) ? 289 : 260);
        else if (MCS_rate[0] & BIT(2))
-               max_rate = (bw_40MHz) ? ((short_GI)?450:405):((short_GI)?217:195);
+               max_rate = (bw_40MHz) ? ((short_GI) ? 450 : 405) : ((short_GI) ? 217 : 195);
        else if (MCS_rate[0] & BIT(1))
-               max_rate = (bw_40MHz) ? ((short_GI)?300:270):((short_GI)?144:130);
+               max_rate = (bw_40MHz) ? ((short_GI) ? 300 : 270) : ((short_GI) ? 144 : 130);
        else if (MCS_rate[0] & BIT(0))
-               max_rate = (bw_40MHz) ? ((short_GI)?150:135):((short_GI)?72:65);
+               max_rate = (bw_40MHz) ? ((short_GI) ? 150 : 135) : ((short_GI) ? 72 : 65);
 
        return max_rate;
 }