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>

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
index d7363165547a7e056fc7a7cb2d229bf47af126ec..484d08fe80cd45c42793d287e09677d0acce95c1 100644 (file)
--- 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 af1d50482e1217758b42a5c249913c88609258b2..f211c5db753fec55d558e53836477514d8edea21 100644 (file)
--- 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