summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/rtl8192e/rtl819x_HT.h2
-rw-r--r--drivers/staging/rtl8192e/rtl819x_HTProc.c4
-rw-r--r--drivers/staging/rtl8192e/rtllib_wx.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index 1b08507cab87..008611e3aace 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -28,7 +28,7 @@ struct ht_capab_ele {
u8 chl_width:1;
u8 mimo_pwr_save:2;
u8 GreenField:1;
- u8 ShortGI20Mhz:1;
+ u8 short_gi_20mhz:1;
u8 short_gi_40mhz:1;
u8 TxSTBC:1;
u8 RxSTBC:2;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 6c557717d8af..3b1c6e24103e 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -259,7 +259,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
cap_ele->mimo_pwr_save = 3;
cap_ele->GreenField = 0;
- cap_ele->ShortGI20Mhz = 1;
+ cap_ele->short_gi_20mhz = 1;
cap_ele->short_gi_40mhz = 1;
cap_ele->TxSTBC = 1;
@@ -457,7 +457,7 @@ void ht_on_assoc_rsp(struct rtllib_device *ieee)
ht_info->cur_tx_bw40mhz = ((pPeerHTInfo->RecommemdedTxWidth == 1) ?
true : false);
- ht_info->cur_short_gi_20mhz = ((pPeerHTCap->ShortGI20Mhz == 1) ? true : false);
+ ht_info->cur_short_gi_20mhz = ((pPeerHTCap->short_gi_20mhz == 1) ? true : false);
ht_info->cur_short_gi_40mhz = ((pPeerHTCap->short_gi_40mhz == 1) ? true : false);
ht_info->current_ampdu_enable = ht_info->ampdu_enable;
diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c
index 71ecfd0c8ed7..fbd4ec824084 100644
--- a/drivers/staging/rtl8192e/rtllib_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_wx.c
@@ -132,7 +132,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
is40M = (ht_cap->chl_width) ? 1 : 0;
isShortGI = (ht_cap->chl_width) ?
((ht_cap->short_gi_40mhz) ? 1 : 0) :
- ((ht_cap->ShortGI20Mhz) ? 1 : 0);
+ ((ht_cap->short_gi_20mhz) ? 1 : 0);
max_mcs = ht_get_highest_mcs_rate(ieee, ht_cap->MCS,
MCS_FILTER_ALL);