staging: rtl8192e: Remove constant variable forced_short_gi

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

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/fc5711032c658af6ae6c5a7a98c52871c29f8c33.1702406712.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 43472b2250c2b868e2cdf2bdf47cf0d54ae97315..e6cd906dc0aca54a31d5ba1b1e599e7a9cb9d9ad 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -110,7 +110,6 @@ struct rt_hi_throughput {
        u8 current_mpdu_density;
        u8 forced_ampdu_factor;
        u8 forced_mpdu_density;
-       u8 forced_short_gi;
        u8 current_op_mode;
        enum ht_extchnl_offset CurSTAExtChnlOffset;
        u8 cur_tx_bw40mhz;

diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 1cbd6493f089c5cfa71446be796a2801727b3517..3482ee008ac16dd00bcc47ff6939b9c92e816250 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -527,7 +527,6 @@ void HTInitializeHTInfo(struct rtllib_device *ieee)
 
        ht_info->cur_short_gi_20mhz = false;
        ht_info->cur_short_gi_40mhz = false;
-       ht_info->forced_short_gi = false;
 
        ht_info->current_mpdu_density = ht_info->mpdu_density;
        ht_info->CurrentAMPDUFactor = ht_info->ampdu_factor;

diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
index 0fa6f674a844bdd3b3b51833f88ed11067549c51..f7098a2ba8b0b332f6c45eda6b7434348b117477 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_tx.c
+++ b/drivers/staging/rtl8192e/rtllib_tx.c
@@ -340,11 +340,6 @@ static void rtllib_query_HTCapShortGI(struct rtllib_device *ieee,
        if (!ht_info->current_ht_support || !ht_info->enable_ht)
                return;
 
-       if (ht_info->forced_short_gi) {
-               tcb_desc->bUseShortGI = true;
-               return;
-       }
-
        if (ht_info->cur_bw_40mhz && ht_info->cur_short_gi_40mhz)
                tcb_desc->bUseShortGI = true;
        else if (!ht_info->cur_bw_40mhz && ht_info->cur_short_gi_20mhz)