summaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/651-0016-rtl8xxxu-Determine-the-need-for-SGI-before-handling-.patch
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2016-09-29 09:48:09 +0200
committerÁlvaro Fernández Rojas <noltari@gmail.com>2016-09-29 10:32:41 +0200
commitc795794eef8737f6272b2acce9025807af52da81 (patch)
treee827cc19dc4d140021b84dae65e2ea28eb090d5d /package/kernel/mac80211/patches/651-0016-rtl8xxxu-Determine-the-need-for-SGI-before-handling-.patch
parent71144844e109bbf0ef62984eeadabbf5702a1cee (diff)
downloadmaster-31e0f0ae-c795794eef8737f6272b2acce9025807af52da81.tar.gz
master-31e0f0ae-c795794eef8737f6272b2acce9025807af52da81.tar.bz2
master-31e0f0ae-c795794eef8737f6272b2acce9025807af52da81.zip
mac80211: use upstream patches for rtl8xxxu
Also improves rtl8188eu support. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'package/kernel/mac80211/patches/651-0016-rtl8xxxu-Determine-the-need-for-SGI-before-handling-.patch')
-rw-r--r--package/kernel/mac80211/patches/651-0016-rtl8xxxu-Determine-the-need-for-SGI-before-handling-.patch52
1 files changed, 0 insertions, 52 deletions
diff --git a/package/kernel/mac80211/patches/651-0016-rtl8xxxu-Determine-the-need-for-SGI-before-handling-.patch b/package/kernel/mac80211/patches/651-0016-rtl8xxxu-Determine-the-need-for-SGI-before-handling-.patch
deleted file mode 100644
index fd89360c30..0000000000
--- a/package/kernel/mac80211/patches/651-0016-rtl8xxxu-Determine-the-need-for-SGI-before-handling-.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 20296682e77606561c3899e6f2f4f881974472f3 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Mon, 25 Jul 2016 13:14:02 -0400
-Subject: [PATCH] rtl8xxxu: Determine the need for SGI before handling specific
- TX desc formats
-
-In order to be able to split out the TX descriptor handling code,
-determine in advance the need to mark SGI.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -4770,7 +4770,7 @@ static void rtl8xxxu_tx(struct ieee80211
- u16 rate_flag = tx_info->control.rates[0].flags;
- int tx_desc_size = priv->fops->tx_desc_size;
- int ret;
-- bool usedesc40, ampdu_enable;
-+ bool usedesc40, ampdu_enable, sgi = false;
-
- if (skb_headroom(skb) < tx_desc_size) {
- dev_warn(dev,
-@@ -4854,6 +4854,12 @@ static void rtl8xxxu_tx(struct ieee80211
- else
- rate = tx_rate->hw_value;
-
-+ if (rate_flag & IEEE80211_TX_RC_SHORT_GI ||
-+ (ieee80211_is_data_qos(hdr->frame_control) &&
-+ sta && sta->ht_cap.cap &
-+ (IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_SGI_20)))
-+ sgi = true;
-+
- seq_number = IEEE80211_SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl));
- if (!usedesc40) {
- tx_desc->txdw5 = cpu_to_le32(rate);
-@@ -4886,12 +4892,8 @@ static void rtl8xxxu_tx(struct ieee80211
- (sta && vif && vif->bss_conf.use_short_preamble))
- tx_desc->txdw4 |= cpu_to_le32(TXDESC32_SHORT_PREAMBLE);
-
-- if (rate_flag & IEEE80211_TX_RC_SHORT_GI ||
-- (ieee80211_is_data_qos(hdr->frame_control) &&
-- sta && sta->ht_cap.cap &
-- (IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_SGI_20))) {
-+ if (sgi)
- tx_desc->txdw5 |= cpu_to_le32(TXDESC32_SHORT_GI);
-- }
-
- if (rate_flag & IEEE80211_TX_RC_USE_RTS_CTS) {
- /*