Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 792be048 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Greg Kroah-Hartman
Browse files

Revert "rt2800: use TXOP_BACKOFF for probe frames" 



commit 52a19236 upstream.

This reverts commit fb47ada8.

In some situations when we set TXOP_BACKOFF, the probe frame is
not sent at all. What it worse then sending probe frame as part
of AMPDU and can degrade 11n performance to 11g rates.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a7027b7d

drivers/net/wireless/ralink/rt2x00/rt2x00queue.c

+3 −4
Original line number Diff line number Diff line
@@ -372,16 +372,15 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev, 


	/*

	 * Determine IFS values

	 * - Use TXOP_BACKOFF for probe and management frames except beacons

	 * - Use TXOP_BACKOFF for 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)) ||

	    (tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE))

	if (ieee80211_is_mgmt(hdr->frame_control) &&

	    !ieee80211_is_beacon(hdr->frame_control))

		txdesc->u.ht.txop = TXOP_BACKOFF;

	else if (!(tx_info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT))

		txdesc->u.ht.txop = TXOP_SIFS;