diff options
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/rtl8192e/rtl819x_HT.h | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl819x_HTProc.c | 6 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtllib_wx.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h index 25cdfdf85991..1b08507cab87 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -29,7 +29,7 @@ struct ht_capab_ele { u8 mimo_pwr_save:2; u8 GreenField:1; u8 ShortGI20Mhz:1; - u8 ShortGI40Mhz:1; + u8 short_gi_40mhz:1; u8 TxSTBC:1; u8 RxSTBC:2; u8 DelayBA:1; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index 73d1e19a59ba..6c557717d8af 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -260,7 +260,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->ShortGI40Mhz = 1; + cap_ele->short_gi_40mhz = 1; cap_ele->TxSTBC = 1; cap_ele->RxSTBC = 0; @@ -299,7 +299,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap, cap_ele->MCS[1] &= 0x00; if (ht->iot_action & HT_IOT_ACT_DISABLE_RX_40MHZ_SHORT_GI) - cap_ele->ShortGI40Mhz = 0; + cap_ele->short_gi_40mhz = 0; if (ieee->get_half_nmode_support_by_aps_handler(ieee->dev)) { cap_ele->chl_width = 0; @@ -458,7 +458,7 @@ void ht_on_assoc_rsp(struct rtllib_device *ieee) true : false); ht_info->cur_short_gi_20mhz = ((pPeerHTCap->ShortGI20Mhz == 1) ? true : false); - ht_info->cur_short_gi_40mhz = ((pPeerHTCap->ShortGI40Mhz == 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; if (ieee->rtllib_ap_sec_type && diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c index 1cfd109881ad..71ecfd0c8ed7 100644 --- a/drivers/staging/rtl8192e/rtllib_wx.c +++ b/drivers/staging/rtl8192e/rtllib_wx.c @@ -131,7 +131,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, &network->bssht.bd_ht_cap_buf[0]; is40M = (ht_cap->chl_width) ? 1 : 0; isShortGI = (ht_cap->chl_width) ? - ((ht_cap->ShortGI40Mhz) ? 1 : 0) : + ((ht_cap->short_gi_40mhz) ? 1 : 0) : ((ht_cap->ShortGI20Mhz) ? 1 : 0); max_mcs = ht_get_highest_mcs_rate(ieee, ht_cap->MCS, |