summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/rtl8192e/rtl819x_HT.h1
-rw-r--r--drivers/staging/rtl8192e/rtl819x_HTProc.c1
-rw-r--r--drivers/staging/rtl8192e/rtllib_tx.c5
3 files changed, 0 insertions, 7 deletions
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index 43472b2250c2..e6cd906dc0ac 100644
--- 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 1cbd6493f089..3482ee008ac1 100644
--- 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 0fa6f674a844..f7098a2ba8b0 100644
--- 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)