From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D9D226D00 for ; Sat, 22 May 2021 09:17:29 +0000 (UTC) Received: by mail-pj1-f44.google.com with SMTP id h20-20020a17090aa894b029015db8f3969eso7831142pjq.3 for ; Sat, 22 May 2021 02:17:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=32vletY3W6qZdcYy8jDbXQ8gIV4bJm8FuAU2OUrb+YU=; b=XnBsEcezOaeIg4aq1j7E66H5EAAwGST6J7nQ5O/MA+f3cTr+YxZVxOhBdSo61Fz+Z5 beYTSxHXyNHa/CXTwYm6p6+Vy8tITyPyu8N4MNoDfNE99RA8evWOp3sjfdSSkoJHqNzY 1OfXkkiXBl8UG8n4u2QW0abumGlnLueinRwnPlCbsZBaJLEzPM2Qx8xkrsP8rWMipXUh 5mTW/ReXxwT3jFB1RBnMH3CcfuszUHIIAQtOH/X0hAzxUZazfBWNVRse1JoeQ6yAR9VS Ti1wLcheSin9BRqENzxGHh/GLd3fcUgpnHg7S4hFtjHG26Z2Whcset1/CA/ET1LzGJ9I XiTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=32vletY3W6qZdcYy8jDbXQ8gIV4bJm8FuAU2OUrb+YU=; b=E8AeLz95yNODDcjBfHjjlW6rJ7zWbX3ynj3QU2fTE9kX01wOmfRnIxZh4aW27frhpi qaHx+NH/FG5FRcEMRcdFjuatDxUyMa8Z8we20WRt2zlbjgWHznstXGMTI2uutYYzuNRI BgMxGoB4djOu26kcmR1P+XdcD1fOfPLlm25yBGcviABVKKWv1cpxU0e0pwPDH0zJMcu1 zTIo/vIWFj8K0bgjPXdHs67qwH55ruqZorW7y4OhmVaUMNfsrgvmH2nMqRJpgRVpKjEf GuzdCRfvMABiDqzrI45yj4aPETMdp2ILGcEBdKzas2m9sx8OFq/23gZqjsQLl4dC1jFf HCPA== X-Gm-Message-State: AOAM533GV3wUiYBSWfNOaaa3L5wAC0Tz6nUQ3HQrz+i/u/MrN7AD0FHg klGy9gG2lQTuRATlCLxfi1o5vhGZ50/mTw== X-Google-Smtp-Source: ABdhPJxlZGX2vNsLHNvsjd8D0wvuCFWazjPh12YW03XWAmpq4Q/nRfLHaQsqMtiZl4RJ+SWW5CDw2Q== X-Received: by 2002:a17:90a:284a:: with SMTP id p10mr15092764pjf.198.1621675049410; Sat, 22 May 2021 02:17:29 -0700 (PDT) Received: from fedora.. ([2405:201:6000:a04d:2131:362f:d566:c9d5]) by smtp.googlemail.com with ESMTPSA id e23sm6334224pfl.84.2021.05.22.02.17.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 May 2021 02:17:28 -0700 (PDT) From: Shreyansh Chouhan To: gregkh@linuxfoundation.org, fabioaiuto83@gmail.com, ross.schm.dev@gmail.com, straube.linux@gmail.com Cc: Shreyansh Chouhan , linux-staging@lists.linux.dev, linux-kernel@bger.kernel.org Subject: [PATCH 1/2] [RFC] staging: rtl8723bs: refactor to reduce indents Date: Sat, 22 May 2021 14:47:18 +0530 Message-Id: <20210522091719.64277-2-chouhan.shreyansh630@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210522091719.64277-1-chouhan.shreyansh630@gmail.com> References: <20210522091719.64277-1-chouhan.shreyansh630@gmail.com> X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 for the realtek vendor in the function check_assoc_AP to a separate function named get_realtek_assoc_AP_vender. It takes a pointer to struct ndis_80211_var_ie as an argument and returns a u32 realtek vendor. Signed-off-by: Shreyansh Chouhan --- .../staging/rtl8723bs/core/rtw_wlan_util.c | 108 +++++++++--------- 1 file changed, 56 insertions(+), 52 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c index ce47ef4edea0..36e515a7ab5c 100644 --- 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 { -- 2.31.1