staging: rtl8192e: Remove variable ht_info->reg_supp_cck

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>
Link: https://lore.kernel.org/r/2c9be9efb1c0608a7fc2658d813b9adbc1185db1.1702212003.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index bbfdfb79c6f2190824a392d71ac79dcfb7bf7b12..6556c5df958d764044eada6aeacece3e3a4a12f7 100644 (file)
--- 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 f81d9ba9c9f531c9b1e935abef5b9271055f0349..7acc8b4c11c4affca3ddf117be0a717eee6aa5fd 100644 (file)
--- 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;