[09/10] staging: rtl8192e: Remove variable ht_info->bCurSuppCCK
Commit Message
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>
---
drivers/staging/rtl8192e/rtl819x_HT.h | 1 -
drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ----
drivers/staging/rtl8192e/rtllib_softmac.c | 5 +----
3 files changed, 1 insertion(+), 9 deletions(-)
@@ -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;
@@ -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;
@@ -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;