staging: rtl8192e: Remove variable ht_info->mpdu_density

ht_info->mpdu_density 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/ef90d31e0e8281235ae4d138ce2de26e35c1bbd1.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 c4af9968cd67920df4e69555e14f9de97bebdd24..1da56f1c04eb03444682620f778a2d2ab1f096f8 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -105,7 +105,6 @@ struct rt_hi_throughput {
        u8 current_ampdu_enable;
        u8 ampdu_factor;
        u8 CurrentAMPDUFactor;
-       u8 mpdu_density;
        u8 current_mpdu_density;
        u8 forced_ampdu_factor;
        u8 forced_mpdu_density;

diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index b1770411c8c5a548dfe337726661ed7fd97ab3ec..de5e3c99e03ad6ab4b876e7e21b9675822c2f772 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -73,7 +73,6 @@ void ht_update_default_setting(struct rtllib_device *ieee)
 
        ht_info->ampdu_enable = 1;
        ht_info->ampdu_factor = 2;
-       ht_info->mpdu_density = 0;
 
        ieee->tx_dis_rate_fallback = 0;
        ieee->tx_use_drv_assinged_rate = 0;
@@ -491,8 +490,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee)
                                                            HT_AGG_SIZE_32K);
                }
        }
-       ht_info->current_mpdu_density = max_t(u8, ht_info->mpdu_density,
-                                             pPeerHTCap->MPDUDensity);
+       ht_info->current_mpdu_density = pPeerHTCap->MPDUDensity;
        if (ht_info->iot_action & HT_IOT_ACT_TX_USE_AMSDU_8K) {
                ht_info->current_ampdu_enable = false;
        }
@@ -526,7 +524,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee)
        ht_info->cur_short_gi_20mhz = false;
        ht_info->cur_short_gi_40mhz = false;
 
-       ht_info->current_mpdu_density = ht_info->mpdu_density;
+       ht_info->current_mpdu_density = 0;
        ht_info->CurrentAMPDUFactor = ht_info->ampdu_factor;
 
        memset((void *)(&ht_info->SelfHTCap), 0,