From: Michael Straube <straube.linux@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Michael Straube <straube.linux@gmail.com>
Subject: [PATCH v2 01/10] staging: r8188eu: remove rf_type from rtw_update_ht_cap()
Date: Sun, 28 Nov 2021 18:09:15 +0100 [thread overview]
Message-ID: <20211128170924.5874-2-straube.linux@gmail.com> (raw)
In-Reply-To: <20211128170924.5874-1-straube.linux@gmail.com>
rf_type is always RF_1T1R. Remove it from rtw_update_ht_cap() and
remove related dead code.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/core/rtw_mlme.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index 8d14aff32f61..a3996a7ee814 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -1999,17 +1999,11 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len)
(le16_to_cpu(pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) & BIT(1)) &&
(pmlmeinfo->HT_info.infos[0] & BIT(2))) {
int i;
- u8 rf_type;
-
- GetHwReg8188EU(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type));
/* update the MCS rates */
- for (i = 0; i < 16; i++) {
- if ((rf_type == RF_1T1R) || (rf_type == RF_1T2R))
- pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i];
- else
- pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R[i];
- }
+ for (i = 0; i < 16; i++)
+ pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i];
+
/* switch to the 40M Hz mode according to the AP */
pmlmeext->cur_bwmode = HT_CHANNEL_WIDTH_40;
switch ((pmlmeinfo->HT_info.infos[0] & 0x3)) {
--
2.34.0
next prev parent reply other threads:[~2021-11-28 17:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-28 17:09 [PATCH v2 00/10] staging: r8188eu: remove rf_type and rtw_rf_config Michael Straube
2021-11-28 17:09 ` Michael Straube [this message]
2021-11-28 17:09 ` [PATCH v2 02/10] staging: r8188eu: remove rf_type from issue_assocreq() Michael Straube
2021-11-28 17:09 ` [PATCH v2 03/10] staging: r8188eu: remove rf_type from storePwrIndexDiffRateOffset() Michael Straube
2021-11-28 17:09 ` [PATCH v2 04/10] staging: r8188eu: remove rf_type from getTxPowerIndex88E() Michael Straube
2021-11-28 17:09 ` [PATCH v2 05/10] staging: r8188eu: remove TxCount " Michael Straube
2021-11-28 17:09 ` [PATCH v2 06/10] staging: r8188eu: remove rf_type from writeOFDMPowerReg88E() Michael Straube
2021-11-28 17:09 ` [PATCH v2 07/10] staging: r8188eu: remove rf_type from bb_reg_dump() Michael Straube
2021-11-28 17:09 ` [PATCH v2 08/10] staging: r8188eu: remove unused HW_VAR_RF_TYPE Michael Straube
2021-11-28 17:09 ` [PATCH v2 09/10] staging: r8188eu: remove rf_type from struct hal_data_8188e Michael Straube
2021-11-28 17:09 ` [PATCH v2 10/10] staging: r8188eu: remove module parameter rtw_rf_config Michael Straube
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211128170924.5874-2-straube.linux@gmail.com \
--to=straube.linux@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=phil@philpotter.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).