1 From 99afaac4278c9581cef17ddc0c842b51f9b6206d Mon Sep 17 00:00:00 2001
2 From: Jes Sorensen <Jes.Sorensen@redhat.com>
3 Date: Fri, 19 Aug 2016 17:46:39 -0400
4 Subject: [PATCH] rtl8xxxu: Determine need for shore preamble before updating
7 Another patch to move this detection out of the code handling the TX
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 | 12 +++++++-----
14 1 file changed, 7 insertions(+), 5 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, sgi = false;
23 + bool usedesc40, ampdu_enable, sgi = false, short_preamble = false;
25 if (skb_headroom(skb) < tx_desc_size) {
27 @@ -4860,6 +4860,10 @@ static void rtl8xxxu_tx(struct ieee80211
28 (IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_SGI_20)))
31 + if (rate_flag & IEEE80211_TX_RC_USE_SHORT_PREAMBLE ||
32 + (sta && vif && vif->bss_conf.use_short_preamble))
33 + short_preamble = true;
35 seq_number = IEEE80211_SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl));
37 tx_desc->txdw5 = cpu_to_le32(rate);
38 @@ -4888,8 +4892,7 @@ static void rtl8xxxu_tx(struct ieee80211
39 if (ieee80211_is_data_qos(hdr->frame_control))
40 tx_desc->txdw4 |= cpu_to_le32(TXDESC32_QOS);
42 - if (rate_flag & IEEE80211_TX_RC_USE_SHORT_PREAMBLE ||
43 - (sta && vif && vif->bss_conf.use_short_preamble))
45 tx_desc->txdw4 |= cpu_to_le32(TXDESC32_SHORT_PREAMBLE);
48 @@ -4935,8 +4938,7 @@ static void rtl8xxxu_tx(struct ieee80211
49 cpu_to_le32(TXDESC40_RETRY_LIMIT_ENABLE);
52 - if (rate_flag & IEEE80211_TX_RC_USE_SHORT_PREAMBLE ||
53 - (sta && vif && vif->bss_conf.use_short_preamble))
56 cpu_to_le32(TXDESC40_SHORT_PREAMBLE);