diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2016-04-01 00:08:36 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2016-04-07 19:41:15 +0300 |
| commit | 1df1de348572dff0fa7fb9c447d991c8dc1348f8 (patch) | |
| tree | a7033095ee3dd84d42795344c40334beb8210454 /drivers | |
| parent | 169bc5cb0b8162d271c8fd38ff3d90b098241e16 (diff) | |
| download | linux-1df1de348572dff0fa7fb9c447d991c8dc1348f8.tar.xz | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c index d7363165547a..484d08fe80cd 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c @@ -7295,7 +7295,7 @@ static void rtl8xxxu_tx(struct ieee80211_hw *hw, (ieee80211_is_data_qos(hdr->frame_control) && sta && sta->ht_cap.cap & (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) { diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h index af1d50482e12..f211c5db753f 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h @@ -501,7 +501,7 @@ struct rtl8xxxu_txdesc40 { /* Word 5 */ #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 TXDESC32_RETRY_LIMIT_ENABLE BIT(17) #define TXDESC32_RETRY_LIMIT_SHIFT 18 |