Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1df1de34 authored by Jes Sorensen's avatar Jes Sorensen Committed by Kalle Valo
Browse files

rtl8xxxu: TXDESC_SHORT_GI is txdesc32 only 



This is no short GI bit in the txdesc40 format.

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 169bc5cb

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h

+1 −1
Original line number Diff line number Diff line
@@ -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