From: Philipp Hortmann <philipp.g.hortmann@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH 03/10] staging: rtl8192e: Remove variable ht_info->reg_supp_cck
Date: Sun, 10 Dec 2023 16:26:18 +0100 [thread overview]
Message-ID: <2c9be9efb1c0608a7fc2658d813b9adbc1185db1.1702212003.git.philipp.g.hortmann@gmail.com> (raw)
In-Reply-To: <cover.1702212003.git.philipp.g.hortmann@gmail.com>
ht_info->reg_supp_cck is set to 1 and unchanged. Therefore all equations
result accordingly and ht_info->reg_supp_cck can be removed.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
drivers/staging/rtl8192e/rtl819x_HT.h | 1 -
drivers/staging/rtl8192e/rtl819x_HTProc.c | 8 ++------
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index bbfdfb79c6f2..6556c5df958d 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -99,7 +99,6 @@ struct rt_hi_throughput {
u8 cur_short_gi_40mhz;
u8 reg_short_gi_20mhz;
u8 cur_short_gi_20mhz;
- u8 reg_supp_cck;
u8 bCurSuppCCK;
enum ht_spec_ver ePeerHTSpecVer;
struct ht_capab_ele SelfHTCap;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index f81d9ba9c9f5..7acc8b4c11c4 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -74,8 +74,6 @@ void ht_update_default_setting(struct rtllib_device *ieee)
ht_info->reg_short_gi_20mhz = 1;
ht_info->reg_short_gi_40mhz = 1;
- ht_info->reg_supp_cck = 1;
-
ht_info->amsdu_max_size = 7935UL;
ht_info->amsdu_support = 0;
@@ -281,7 +279,7 @@ void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap,
pCapELE->RxSTBC = 0;
pCapELE->DelayBA = 0;
pCapELE->MaxAMSDUSize = (MAX_RECEIVE_BUFFER_SIZE >= 7935) ? 1 : 0;
- pCapELE->DssCCk = (pHT->reg_supp_cck ? 1 : 0);
+ pCapELE->DssCCk = 1;
pCapELE->PSMP = 0;
pCapELE->LSigTxopProtect = 0;
@@ -480,9 +478,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee)
((pPeerHTCap->ShortGI40Mhz == 1) ?
true : false) : false);
- ht_info->bCurSuppCCK = ((ht_info->reg_supp_cck) ?
- ((pPeerHTCap->DssCCk == 1) ? true :
- false) : false);
+ ht_info->bCurSuppCCK = ((pPeerHTCap->DssCCk == 1) ? true : false);
ht_info->bCurrent_AMSDU_Support = ht_info->amsdu_support;
--
2.43.0
next prev parent reply other threads:[~2023-12-10 15:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-10 15:25 [PATCH 00/10] staging: rtl8192e: Remove variable reg_bw_40mhz and further Philipp Hortmann
2023-12-10 15:25 ` [PATCH 01/10] staging: rtl8192e: Remove unused struct iw_range_with_scan_capa Philipp Hortmann
2023-12-10 15:26 ` [PATCH 02/10] staging: rtl8192e: Remove variable ht_info->reg_bw_40mhz Philipp Hortmann
2023-12-10 15:26 ` Philipp Hortmann [this message]
2023-12-10 15:26 ` [PATCH 04/10] staging: rtl8192e: Remove variable ht_info->reg_short_gi_20mhz Philipp Hortmann
2023-12-10 15:26 ` [PATCH 05/10] staging: rtl8192e: Remove variable ht_info->reg_short_gi_40mhz Philipp Hortmann
2023-12-10 15:26 ` [PATCH 06/10] staging: rtl8192e: Remove variable ForcedAMPDUMode Philipp Hortmann
2023-12-10 15:26 ` [PATCH 07/10] staging: rtl8192e: Remove variable ForcedAMSDUMode Philipp Hortmann
2023-12-10 15:26 ` [PATCH 08/10] staging: rtl8192e: Remove equation with pPeerHTCap->DssCCk Philipp Hortmann
2023-12-10 15:26 ` [PATCH 09/10] staging: rtl8192e: Remove variable ht_info->bCurSuppCCK Philipp Hortmann
2023-12-10 15:27 ` [PATCH 10/10] staging: rtl8192e: Remove struct ht_info_ele SelfHTInfo Philipp Hortmann
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=2c9be9efb1c0608a7fc2658d813b9adbc1185db1.1702212003.git.philipp.g.hortmann@gmail.com \
--to=philipp.g.hortmann@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/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).