openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

rtl8xxxu: TXDESC_SHORT_GI is txdesc32 only 

This is no short GI bit in the txdesc40 format.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Jes Sorensen 2016-03-31 17:08:36 -04:00 committed by Kalle Valo
parent 169bc5cb0b
commit 1df1de3485
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
View File

@ -7295,7 +7295,7 @@ static void rtl8xxxu_tx(struct ieee80211_hw *hw,
(ieee80211_is_data_qos(hdr->frame_control) && (ieee80211_is_data_qos(hdr->frame_control) &&
sta && sta->ht_cap.cap & sta && sta->ht_cap.cap &
(IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_SGI_20))) { (IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_SGI_20))) {
tx_desc->txdw5 |= cpu_to_le32(TXDESC_SHORT_GI); tx_desc->txdw5 |= cpu_to_le32(TXDESC32_SHORT_GI);
} }
if (rate_flag & IEEE80211_TX_RC_USE_RTS_CTS) { if (rate_flag & IEEE80211_TX_RC_USE_RTS_CTS) {

2
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
View File

@ -501,7 +501,7 @@ struct rtl8xxxu_txdesc40 {
/* Word 5 */ /* Word 5 */
#define TXDESC40_SHORT_PREAMBLE BIT(4) #define TXDESC40_SHORT_PREAMBLE BIT(4)
#define TXDESC_SHORT_GI BIT(6) #define TXDESC32_SHORT_GI BIT(6)
#define TXDESC_CCX_TAG BIT(7) #define TXDESC_CCX_TAG BIT(7)
#define TXDESC32_RETRY_LIMIT_ENABLE BIT(17) #define TXDESC32_RETRY_LIMIT_ENABLE BIT(17)
#define TXDESC32_RETRY_LIMIT_SHIFT 18 #define TXDESC32_RETRY_LIMIT_SHIFT 18