]>
Commit | Line | Data |
---|---|---|
5ea3d7c4 GKH |
1 | From 52a192362932f333a7ebafd581c4d9b81da2fec8 Mon Sep 17 00:00:00 2001 |
2 | From: Stanislaw Gruszka <sgruszka@redhat.com> | |
3 | Date: Mon, 28 May 2018 13:25:06 +0200 | |
4 | Subject: Revert "rt2800: use TXOP_BACKOFF for probe frames" | |
5 | ||
6 | From: Stanislaw Gruszka <sgruszka@redhat.com> | |
7 | ||
8 | commit 52a192362932f333a7ebafd581c4d9b81da2fec8 upstream. | |
9 | ||
10 | This reverts commit fb47ada8dc3c30c8e7b415da155742b49536c61e. | |
11 | ||
12 | In some situations when we set TXOP_BACKOFF, the probe frame is | |
13 | not sent at all. What it worse then sending probe frame as part | |
14 | of AMPDU and can degrade 11n performance to 11g rates. | |
15 | ||
16 | Cc: stable@vger.kernel.org | |
17 | Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> | |
18 | Signed-off-by: Kalle Valo <kvalo@codeaurora.org> | |
19 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
20 | ||
21 | --- | |
22 | drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 7 +++---- | |
23 | 1 file changed, 3 insertions(+), 4 deletions(-) | |
24 | ||
25 | --- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | |
26 | +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | |
27 | @@ -372,16 +372,15 @@ static void rt2x00queue_create_tx_descri | |
28 | ||
29 | /* | |
30 | * Determine IFS values | |
31 | - * - Use TXOP_BACKOFF for probe and management frames except beacons | |
32 | + * - Use TXOP_BACKOFF for management frames except beacons | |
33 | * - Use TXOP_SIFS for fragment bursts | |
34 | * - Use TXOP_HTTXOP for everything else | |
35 | * | |
36 | * Note: rt2800 devices won't use CTS protection (if used) | |
37 | * for frames not transmitted with TXOP_HTTXOP | |
38 | */ | |
39 | - if ((ieee80211_is_mgmt(hdr->frame_control) && | |
40 | - !ieee80211_is_beacon(hdr->frame_control)) || | |
41 | - (tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)) | |
42 | + if (ieee80211_is_mgmt(hdr->frame_control) && | |
43 | + !ieee80211_is_beacon(hdr->frame_control)) | |
44 | txdesc->u.ht.txop = TXOP_BACKOFF; | |
45 | else if (!(tx_info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)) | |
46 | txdesc->u.ht.txop = TXOP_SIFS; |