[03/10] staging: rtl8192e: Remove variable ht_info->reg_supp_cck
Commit Message
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(-)
@@ -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;
@@ -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;