staging: rtl8723bs: refactor to reduce indents

Reduce the number of indents in rtw_wlan_util.c file by refactoring the
code.

Moved the part of code that rearranged ac paramaters in the function
WMMOnAssocResp to a separate function named sort_wmm_ac_params. It takes
both the array of ac params and their indexes as arguments and sorts them.
Has return type void.

Moved the part of code that checked IE for realtek vendor in the
function check_assoc_AP to a separate function named
get_realtek_assoc_AP_vender. It takes a struct ndis_80211_var_ie * as an
argument and returns u32 realtek vendor.

Signed-off-by: Shreyansh Chouhan <chouhan.shreyansh630@gmail.com>
Link: https://lore.kernel.org/r/20210524135105.5550-2-chouhan.shreyansh630@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index ce47ef4edea07c3db2136c807b6e89db32c62299..36e515a7ab5c44f1b4ef465422beab42f4bd486c 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -777,6 +777,32 @@ int WMM_param_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE)
        return true;
 }
 
+static void sort_wmm_ac_params(u32 *inx, u32 *edca)
+{
+       u32 i, j, change_inx = false;
+
+       /* entry indx: 0->vo, 1->vi, 2->be, 3->bk. */
+       for (i = 0; i < 4; i++) {
+               for (j = i + 1; j < 4; j++) {
+                       /* compare CW and AIFS */
+                       if ((edca[j] & 0xFFFF) < (edca[i] & 0xFFFF)) {
+                               change_inx = true;
+                       } else if ((edca[j] & 0xFFFF) == (edca[i] & 0xFFFF)) {
+                               /* compare TXOP */
+                               if ((edca[j] >> 16) > (edca[i] >> 16))
+                                       change_inx = true;
+                       }
+
+                       if (change_inx) {
+                               swap(edca[i], edca[j]);
+                               swap(inx[i], inx[j]);
+
+                               change_inx = false;
+                       }
+               }
+       }
+}
+
 void WMMOnAssocRsp(struct adapter *padapter)
 {
        u8 ACI, ACM, AIFS, ECWMin, ECWMax, aSifsTime;
@@ -873,35 +899,8 @@ void WMMOnAssocRsp(struct adapter *padapter)
 
                inx[0] = 0; inx[1] = 1; inx[2] = 2; inx[3] = 3;
 
-               if (pregpriv->wifi_spec == 1) {
-                       u32 j, tmp, change_inx = false;
-
-                       /* entry indx: 0->vo, 1->vi, 2->be, 3->bk. */
-                       for (i = 0; i < 4; i++) {
-                               for (j = i+1; j < 4; j++) {
-                                       /* compare CW and AIFS */
-                                       if ((edca[j] & 0xFFFF) < (edca[i] & 0xFFFF)) {
-                                               change_inx = true;
-                                       } else if ((edca[j] & 0xFFFF) == (edca[i] & 0xFFFF)) {
-                                               /* compare TXOP */
-                                               if ((edca[j] >> 16) > (edca[i] >> 16))
-                                                       change_inx = true;
-                                       }
-
-                                       if (change_inx) {
-                                               tmp = edca[i];
-                                               edca[i] = edca[j];
-                                               edca[j] = tmp;
-
-                                               tmp = inx[i];
-                                               inx[i] = inx[j];
-                                               inx[j] = tmp;
-
-                                               change_inx = false;
-                                       }
-                               }
-                       }
-               }
+               if (pregpriv->wifi_spec == 1)
+                       sort_wmm_ac_params(inx, edca);
 
                for (i = 0; i < 4; i++)
                        pxmitpriv->wmm_para_seq[i] = inx[i];
@@ -1496,6 +1495,33 @@ void set_sta_rate(struct adapter *padapter, struct sta_info *psta)
        Update_RA_Entry(padapter, psta);
 }
 
+static u32 get_realtek_assoc_AP_vender(struct ndis_80211_var_ie *pIE)
+{
+       u32 Vender = HT_IOT_PEER_REALTEK;
+
+       if (pIE->Length >= 5) {
+               if (pIE->data[4] == 1)
+                       /* if (pIE->data[5] & RT_HT_CAP_USE_LONG_PREAMBLE) */
+                       /* bssDesc->BssHT.RT2RT_HT_Mode |= RT_HT_CAP_USE_LONG_PREAMBLE; */
+                       if (pIE->data[5] & RT_HT_CAP_USE_92SE)
+                               /* bssDesc->BssHT.RT2RT_HT_Mode |= RT_HT_CAP_USE_92SE; */
+                               Vender = HT_IOT_PEER_REALTEK_92SE;
+
+               if (pIE->data[5] & RT_HT_CAP_USE_SOFTAP)
+                       Vender = HT_IOT_PEER_REALTEK_SOFTAP;
+
+               if (pIE->data[4] == 2) {
+                       if (pIE->data[6] & RT_HT_CAP_USE_JAGUAR_BCUT)
+                               Vender = HT_IOT_PEER_REALTEK_JAGUAR_BCUTAP;
+
+                       if (pIE->data[6] & RT_HT_CAP_USE_JAGUAR_CCUT)
+                               Vender = HT_IOT_PEER_REALTEK_JAGUAR_CCUTAP;
+               }
+       }
+
+       return Vender;
+}
+
 unsigned char check_assoc_AP(u8 *pframe, uint len)
 {
        unsigned int    i;
@@ -1519,29 +1545,7 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)
                        } else if (!memcmp(pIE->data, CISCO_OUI, 3)) {
                                return HT_IOT_PEER_CISCO;
                        } else if (!memcmp(pIE->data, REALTEK_OUI, 3)) {
-                               u32 Vender = HT_IOT_PEER_REALTEK;
-
-                               if (pIE->Length >= 5) {
-                                       if (pIE->data[4] == 1)
-                                               /* if (pIE->data[5] & RT_HT_CAP_USE_LONG_PREAMBLE) */
-                                               /* bssDesc->BssHT.RT2RT_HT_Mode |= RT_HT_CAP_USE_LONG_PREAMBLE; */
-                                               if (pIE->data[5] & RT_HT_CAP_USE_92SE)
-                                                       /* bssDesc->BssHT.RT2RT_HT_Mode |= RT_HT_CAP_USE_92SE; */
-                                                       Vender = HT_IOT_PEER_REALTEK_92SE;
-
-                                       if (pIE->data[5] & RT_HT_CAP_USE_SOFTAP)
-                                               Vender = HT_IOT_PEER_REALTEK_SOFTAP;
-
-                                       if (pIE->data[4] == 2) {
-                                               if (pIE->data[6] & RT_HT_CAP_USE_JAGUAR_BCUT)
-                                                       Vender = HT_IOT_PEER_REALTEK_JAGUAR_BCUTAP;
-
-                                               if (pIE->data[6] & RT_HT_CAP_USE_JAGUAR_CCUT)
-                                                       Vender = HT_IOT_PEER_REALTEK_JAGUAR_CCUTAP;
-                                       }
-                               }
-
-                               return Vender;
+                               return get_realtek_assoc_AP_vender(pIE);
                        } else if (!memcmp(pIE->data, AIRGOCAP_OUI, 3)) {
                                return HT_IOT_PEER_AIRGO;
                        } else {