staging: rtl8192e: Remove variable ht_info->reg_short_gi_40mhz

ht_info->reg_short_gi_40mhz is set to 1 and unchanged. Therefore all
equations result accordingly and ht_info->reg_short_gi_40mhz can be
removed.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/255039e0cb27582a98a0b86340dfe88f14c08a76.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 8a4bd389004a2c09741bdc4649eb4512acaa4644..0664eb86bada5d2a4426401abbf0b64c72cf396d 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -95,7 +95,6 @@ struct rt_hi_throughput {
        u8 enable_ht;
        u8 current_ht_support;
        u8 cur_bw_40mhz;
-       u8 reg_short_gi_40mhz;
        u8 cur_short_gi_40mhz;
        u8 cur_short_gi_20mhz;
        u8 bCurSuppCCK;

diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index ed9b3db1a3933ff55ccb8346efa7ee6f9eef2f2b..0a5885d6c0a05a30c0b4af40a94df4034e7e4db0 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -71,8 +71,6 @@ void ht_update_default_setting(struct rtllib_device *ieee)
 {
        struct rt_hi_throughput *ht_info = ieee->ht_info;
 
-       ht_info->reg_short_gi_40mhz = 1;
-
        ht_info->amsdu_max_size = 7935UL;
        ht_info->amsdu_support = 0;
 
@@ -471,9 +469,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee)
                                 true : false);
 
        ht_info->cur_short_gi_20mhz = ((pPeerHTCap->ShortGI20Mhz == 1) ? true : false);
-       ht_info->cur_short_gi_40mhz = ((ht_info->reg_short_gi_40mhz) ?
-                                    ((pPeerHTCap->ShortGI40Mhz == 1) ?
-                                    true : false) : false);
+       ht_info->cur_short_gi_40mhz = ((pPeerHTCap->ShortGI40Mhz == 1) ? true : false);
 
        ht_info->bCurSuppCCK = ((pPeerHTCap->DssCCk == 1) ? true : false);