2017-03-30 16:08:49 +00:00
|
|
|
From fb47ada8dc3c30c8e7b415da155742b49536c61e Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Stanislaw Gruszka <sgruszka@redhat.com>
|
|
|
|
|
Date: Wed, 15 Feb 2017 10:25:12 +0100
|
|
|
|
|
Subject: [PATCH 16/19] rt2800: use TXOP_BACKOFF for probe frames
|
|
|
|
|
|
|
|
|
|
Even if we do not set AMPDU bit in TXWI, device still can aggregate
|
|
|
|
|
frame and send it with rate not corresponding to requested. That mean
|
|
|
|
|
we can do not sent probe frames with requested rate. To prevent that
|
|
|
|
|
use TXOP_BACKOFF for probe frames.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
|
|
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
|
|
|
---
|
|
|
|
|
drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 7 ++++---
|
|
|
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
|
|
|
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
|
2017-06-10 13:30:31 +00:00
|
|
|
@@ -372,15 +372,16 @@ static void rt2x00queue_create_tx_descri
|
2017-03-30 16:08:49 +00:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Determine IFS values
|
|
|
|
|
- * - Use TXOP_BACKOFF for management frames except beacons
|
|
|
|
|
+ * - Use TXOP_BACKOFF for probe and management frames except beacons
|
|
|
|
|
* - Use TXOP_SIFS for fragment bursts
|
|
|
|
|
* - Use TXOP_HTTXOP for everything else
|
|
|
|
|
*
|
|
|
|
|
* Note: rt2800 devices won't use CTS protection (if used)
|
|
|
|
|
* for frames not transmitted with TXOP_HTTXOP
|
|
|
|
|
*/
|
|
|
|
|
- if (ieee80211_is_mgmt(hdr->frame_control) &&
|
|
|
|
|
- !ieee80211_is_beacon(hdr->frame_control))
|
|
|
|
|
+ if ((ieee80211_is_mgmt(hdr->frame_control) &&
|
|
|
|
|
+ !ieee80211_is_beacon(hdr->frame_control)) ||
|
|
|
|
|
+ (tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE))
|
|
|
|
|
txdesc->u.ht.txop = TXOP_BACKOFF;
|
|
|
|
|
else if (!(tx_info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT))
|
|
|
|
|
txdesc->u.ht.txop = TXOP_SIFS;
|
