1 From 3d1d6d96f14881c421860973b4eb4b2fff7cb812 Mon Sep 17 00:00:00 2001
2 From: Jes Sorensen <Jes.Sorensen@redhat.com>
3 Date: Wed, 5 Oct 2016 16:04:54 -0400
4 Subject: [PATCH] rtl8xxxu: Obtain RTS rates from mac80211
6 Use the mac80211 provided rate for RTS rather than the hard coded
7 24Mbps as suggested by the vendor drivers.
9 Reported-by: Andrea Merello <andrea.merello@gmail.com>
10 Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
12 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 6 +--
13 .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 46 ++++++++++++++--------
14 2 files changed, 32 insertions(+), 20 deletions(-)
16 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
17 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
18 @@ -1340,7 +1340,7 @@ struct rtl8xxxu_fileops {
19 void (*fill_txdesc) (struct ieee80211_hdr *hdr,
20 struct rtl8xxxu_txdesc32 *tx_desc, u32 rate,
21 u16 rate_flag, bool sgi, bool short_preamble,
23 + bool ampdu_enable, u32 rts_rate);
24 int writeN_block_size;
27 @@ -1437,11 +1437,11 @@ bool rtl8xxxu_gen2_simularity_compare(st
28 void rtl8xxxu_fill_txdesc_v1(struct ieee80211_hdr *hdr,
29 struct rtl8xxxu_txdesc32 *tx_desc, u32 rate,
30 u16 rate_flag, bool sgi, bool short_preamble,
32 + bool ampdu_enable, u32 rts_rate);
33 void rtl8xxxu_fill_txdesc_v2(struct ieee80211_hdr *hdr,
34 struct rtl8xxxu_txdesc32 *tx_desc32, u32 rate,
35 u16 rate_flag, bool sgi, bool short_preamble,
37 + bool ampdu_enable, u32 rts_rate);
39 extern struct rtl8xxxu_fileops rtl8192cu_fops;
40 extern struct rtl8xxxu_fileops rtl8192eu_fops;
41 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
42 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
43 @@ -4762,7 +4762,7 @@ void
44 rtl8xxxu_fill_txdesc_v1(struct ieee80211_hdr *hdr,
45 struct rtl8xxxu_txdesc32 *tx_desc, u32 rate,
46 u16 rate_flag, bool sgi, bool short_preamble,
48 + bool ampdu_enable, u32 rts_rate)
52 @@ -4796,15 +4796,16 @@ rtl8xxxu_fill_txdesc_v1(struct ieee80211
54 tx_desc->txdw5 |= cpu_to_le32(TXDESC32_SHORT_GI);
57 + * rts_rate is zero if RTS/CTS or CTS to SELF are not enabled
59 + tx_desc->txdw4 |= cpu_to_le32(rts_rate << TXDESC32_RTS_RATE_SHIFT);
60 if (rate_flag & IEEE80211_TX_RC_USE_RTS_CTS) {
62 - * Use RTS rate 24M - does the mac80211 tell
65 - tx_desc->txdw4 |= cpu_to_le32(DESC_RATE_24M <<
66 - TXDESC32_RTS_RATE_SHIFT);
67 tx_desc->txdw4 |= cpu_to_le32(TXDESC32_RTS_CTS_ENABLE);
68 tx_desc->txdw4 |= cpu_to_le32(TXDESC32_HW_RTS_ENABLE);
69 + } else if (rate_flag & IEEE80211_TX_RC_USE_CTS_PROTECT) {
70 + tx_desc->txdw4 |= cpu_to_le32(TXDESC32_CTS_SELF_ENABLE);
71 + tx_desc->txdw4 |= cpu_to_le32(TXDESC32_HW_RTS_ENABLE);
75 @@ -4816,7 +4817,7 @@ void
76 rtl8xxxu_fill_txdesc_v2(struct ieee80211_hdr *hdr,
77 struct rtl8xxxu_txdesc32 *tx_desc32, u32 rate,
78 u16 rate_flag, bool sgi, bool short_preamble,
80 + bool ampdu_enable, u32 rts_rate)
82 struct rtl8xxxu_txdesc40 *tx_desc40;
84 @@ -4849,15 +4850,19 @@ rtl8xxxu_fill_txdesc_v2(struct ieee80211
86 tx_desc40->txdw5 |= cpu_to_le32(TXDESC40_SHORT_PREAMBLE);
88 + tx_desc40->txdw4 |= cpu_to_le32(rts_rate << TXDESC40_RTS_RATE_SHIFT);
90 + * rts_rate is zero if RTS/CTS or CTS to SELF are not enabled
92 if (rate_flag & IEEE80211_TX_RC_USE_RTS_CTS) {
94 - * Use RTS rate 24M - does the mac80211 tell
97 - tx_desc40->txdw4 |= cpu_to_le32(DESC_RATE_24M <<
98 - TXDESC40_RTS_RATE_SHIFT);
99 tx_desc40->txdw3 |= cpu_to_le32(TXDESC40_RTS_CTS_ENABLE);
100 tx_desc40->txdw3 |= cpu_to_le32(TXDESC40_HW_RTS_ENABLE);
101 + } else if (rate_flag & IEEE80211_TX_RC_USE_CTS_PROTECT) {
103 + * For some reason the vendor driver doesn't set
104 + * TXDESC40_HW_RTS_ENABLE for CTS to SELF
106 + tx_desc40->txdw3 |= cpu_to_le32(TXDESC40_CTS_SELF_ENABLE);
110 @@ -4874,7 +4879,7 @@ static void rtl8xxxu_tx(struct ieee80211
111 struct ieee80211_sta *sta = NULL;
112 struct ieee80211_vif *vif = tx_info->control.vif;
113 struct device *dev = &priv->udev->dev;
115 + u32 queue, rate, rts_rate;
116 u16 pktlen = skb->len;
118 u16 rate_flag = tx_info->control.rates[0].flags;
119 @@ -4974,10 +4979,17 @@ static void rtl8xxxu_tx(struct ieee80211
120 (sta && vif && vif->bss_conf.use_short_preamble))
121 short_preamble = true;
123 + if (rate_flag & IEEE80211_TX_RC_USE_RTS_CTS)
124 + rts_rate = ieee80211_get_rts_cts_rate(hw, tx_info)->hw_value;
125 + else if (rate_flag & IEEE80211_TX_RC_USE_CTS_PROTECT)
126 + rts_rate = ieee80211_get_rts_cts_rate(hw, tx_info)->hw_value;
130 seq_number = IEEE80211_SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl));
132 - priv->fops->fill_txdesc(hdr, tx_desc, rate, rate_flag,
133 - sgi, short_preamble, ampdu_enable);
134 + priv->fops->fill_txdesc(hdr, tx_desc, rate, rate_flag, sgi,
135 + short_preamble, ampdu_enable, rts_rate);
137 rtl8xxxu_calc_tx_desc_csum(tx_desc);