1 From 3972cc579140e48e8390fff5e94f6e9e78c3dd87 Mon Sep 17 00:00:00 2001
2 From: Jes Sorensen <Jes.Sorensen@redhat.com>
3 Date: Fri, 19 Aug 2016 17:46:38 -0400
4 Subject: [PATCH] rtl8xxxu: Determine the need for SGI before handling specific
7 In order to be able to split out the TX descriptor handling code,
8 determine in advance the need to mark SGI.
10 Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
11 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
13 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 14 ++++++++------
14 1 file changed, 8 insertions(+), 6 deletions(-)
16 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
17 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
18 @@ -4770,7 +4770,7 @@ static void rtl8xxxu_tx(struct ieee80211
19 u16 rate_flag = tx_info->control.rates[0].flags;
20 int tx_desc_size = priv->fops->tx_desc_size;
22 - bool usedesc40, ampdu_enable;
23 + bool usedesc40, ampdu_enable, sgi = false;
25 if (skb_headroom(skb) < tx_desc_size) {
27 @@ -4854,6 +4854,12 @@ static void rtl8xxxu_tx(struct ieee80211
29 rate = tx_rate->hw_value;
31 + if (rate_flag & IEEE80211_TX_RC_SHORT_GI ||
32 + (ieee80211_is_data_qos(hdr->frame_control) &&
33 + sta && sta->ht_cap.cap &
34 + (IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_SGI_20)))
37 seq_number = IEEE80211_SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl));
39 tx_desc->txdw5 = cpu_to_le32(rate);
40 @@ -4886,12 +4892,8 @@ static void rtl8xxxu_tx(struct ieee80211
41 (sta && vif && vif->bss_conf.use_short_preamble))
42 tx_desc->txdw4 |= cpu_to_le32(TXDESC32_SHORT_PREAMBLE);
44 - if (rate_flag & IEEE80211_TX_RC_SHORT_GI ||
45 - (ieee80211_is_data_qos(hdr->frame_control) &&
46 - sta && sta->ht_cap.cap &
47 - (IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_SGI_20))) {
49 tx_desc->txdw5 |= cpu_to_le32(TXDESC32_SHORT_GI);
52 if (rate_flag & IEEE80211_TX_RC_USE_RTS_CTS) {