diff options
| 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 |
| commit | c795794eef8737f6272b2acce9025807af52da81 (patch) | |
| tree | e827cc19dc4d140021b84dae65e2ea28eb090d5d /package/kernel/mac80211/patches/653-0016-rtl8xxxu-Determine-the-need-for-SGI-before-handling-.patch | |
| parent | 71144844e109bbf0ef62984eeadabbf5702a1cee (diff) | |
| download | master-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/653-0016-rtl8xxxu-Determine-the-need-for-SGI-before-handling-.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/653-0016-rtl8xxxu-Determine-the-need-for-SGI-before-handling-.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/653-0016-rtl8xxxu-Determine-the-need-for-SGI-before-handling-.patch b/package/kernel/mac80211/patches/653-0016-rtl8xxxu-Determine-the-need-for-SGI-before-handling-.patch new file mode 100644 index 0000000000..c87a49ee80 --- /dev/null +++ b/package/kernel/mac80211/patches/653-0016-rtl8xxxu-Determine-the-need-for-SGI-before-handling-.patch @@ -0,0 +1,53 @@ +From 3972cc579140e48e8390fff5e94f6e9e78c3dd87 Mon Sep 17 00:00:00 2001 +From: Jes Sorensen <Jes.Sorensen@redhat.com> +Date: Fri, 19 Aug 2016 17:46:38 -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> +Signed-off-by: Kalle Valo <kvalo@codeaurora.org> +--- + 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) { + /* |