package/kernel/mac80211/patches/090-Revert-rt2800-use-TXOP_BACKOFF-for-probe-frames.patch

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