staging: rtl8192e: Remove variable ForcedAMPDUMode

ForcedAMPDUMode is set to 0 and unchanged. Therefore all equations result
accordingly and ForcedAMPDUMode can be removed. As a result label
FORCED_AGG_SETTING is unused and can be removed as well.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/5bf740a2da78ec3b54249a30cbee70301b37e7eb.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 0664eb86bada5d2a4426401abbf0b64c72cf396d..d249062e7b66aab46188dc72d382842d7ebd258c 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -113,7 +113,6 @@ struct rt_hi_throughput {
        u8 CurrentAMPDUFactor;
        u8 mpdu_density;
        u8 current_mpdu_density;
-       enum ht_aggre_mode ForcedAMPDUMode;
        u8 forced_ampdu_factor;
        u8 forced_mpdu_density;
        enum ht_aggre_mode ForcedAMSDUMode;

diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
index a2ae68cc13f5a5efdaf8cf7b7e3a0c191022fb62..0fa6f674a844bdd3b3b51833f88ed11067549c51 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_tx.c
+++ b/drivers/staging/rtl8192e/rtllib_tx.c
@@ -303,13 +303,13 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee,
                        } else if (!ts->disable_add_ba) {
                                TsStartAddBaProcess(ieee, ts);
                        }
-                       goto FORCED_AGG_SETTING;
+                       return;
                } else if (!ts->using_ba) {
                        if (SN_LESS(ts->tx_admitted_ba_record.ba_start_seq_ctrl.field.seq_num,
                                    (ts->tx_cur_seq + 1) % 4096))
                                ts->using_ba = true;
                        else
-                               goto FORCED_AGG_SETTING;
+                               return;
                }
                if (ieee->iw_mode == IW_MODE_INFRA) {
                        tcb_desc->ampdu_enable = true;
@@ -317,23 +317,6 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee,
                        tcb_desc->ampdu_density = ht_info->current_mpdu_density;
                }
        }
-FORCED_AGG_SETTING:
-       switch (ht_info->ForcedAMPDUMode) {
-       case HT_AGG_AUTO:
-               break;
-
-       case HT_AGG_FORCE_ENABLE:
-               tcb_desc->ampdu_enable = true;
-               tcb_desc->ampdu_density = ht_info->forced_mpdu_density;
-               tcb_desc->ampdu_factor = ht_info->forced_ampdu_factor;
-               break;
-
-       case HT_AGG_FORCE_DISABLE:
-               tcb_desc->ampdu_enable = false;
-               tcb_desc->ampdu_density = 0;
-               tcb_desc->ampdu_factor = 0;
-               break;
-       }
 }
 
 static void rtllib_query_ShortPreambleMode(struct rtllib_device *ieee,