diff options
| author | Philipp Hortmann <philipp.g.hortmann@gmail.com> | 2023-12-10 16:26:58 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-12-15 13:35:21 +0100 |
| commit | a496db4815bf649bcfcd6b31dc327fa1fa76dbba (patch) | |
| tree | 663307e3a1b39f9556926958519ffd40bd859dee /drivers | |
| parent | staging: rtl8192e: Remove equation with pPeerHTCap->DssCCk (diff) | |
| download | linux-a496db4815bf649bcfcd6b31dc327fa1fa76dbba.tar.xz linux-a496db4815bf649bcfcd6b31dc327fa1fa76dbba.zip | |
staging: rtl8192e: Remove variable ht_info->bCurSuppCCK
ht_info->bCurSuppCCK is set to 1 and unchanged. Therefore all equations
result accordingly and ht_info->bCurSuppCCK can be removed.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/159a1a84c7bc90042bf1618a067f02ac123dd15d.1702212003.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/rtl8192e/rtl819x_HT.h | 1 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtllib_softmac.c | 5 |
3 files changed, 1 insertions, 9 deletions
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h index 670affe9d57b..416633b88446 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -97,7 +97,6 @@ struct rt_hi_throughput { u8 cur_bw_40mhz; u8 cur_short_gi_40mhz; u8 cur_short_gi_20mhz; - u8 bCurSuppCCK; enum ht_spec_ver ePeerHTSpecVer; struct ht_capab_ele SelfHTCap; struct ht_info_ele SelfHTInfo; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index ca9da96b6f6c..439b43faa2bb 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -471,8 +471,6 @@ void HTOnAssocRsp(struct rtllib_device *ieee) ht_info->cur_short_gi_20mhz = ((pPeerHTCap->ShortGI20Mhz == 1) ? true : false); ht_info->cur_short_gi_40mhz = ((pPeerHTCap->ShortGI40Mhz == 1) ? true : false); - ht_info->bCurSuppCCK = true; - ht_info->bCurrent_AMSDU_Support = ht_info->amsdu_support; nMaxAMSDUSize = (pPeerHTCap->MaxAMSDUSize == 0) ? 3839 : 7935; @@ -549,8 +547,6 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) ht_info->cur_short_gi_40mhz = false; ht_info->forced_short_gi = false; - ht_info->bCurSuppCCK = true; - ht_info->bCurrent_AMSDU_Support = false; ht_info->nCurrent_AMSDU_MaxSize = ht_info->amsdu_max_size; ht_info->current_mpdu_density = ht_info->mpdu_density; diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index 5c89744b2bbe..416f89ec576c 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -173,10 +173,7 @@ static u8 MgntQuery_MgntFrameTxRate(struct rtllib_device *ieee) rate = ieee->basic_rate & 0x7f; if (rate == 0) { - if (ieee->mode == WIRELESS_MODE_N_24G && !ht_info->bCurSuppCCK) - rate = 0x0c; - else - rate = 0x02; + rate = 0x02; } return rate; |