| Message ID | 1527506706-6488-1-git-send-email-sgruszka@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 52a192362932f333a7ebafd581c4d9b81da2fec8 |
| Delegated to: | Kalle Valo |
| Headers | show |
Stanislaw Gruszka <sgruszka@redhat.com> writes: > This reverts commit fb47ada8dc3c30c8e7b415da155742b49536c61e. > > 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: Stanislaw Gruszka <sgruszka@redhat.com> I'll try to get to this to final 4.17 still (scheduled for next Sunday), but no promises if it makes it.
Stanislaw Gruszka <sgruszka@redhat.com> wrote: > This reverts commit fb47ada8dc3c30c8e7b415da155742b49536c61e. > > 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: Stanislaw Gruszka <sgruszka@redhat.com> Patch applied to wireless-drivers.git, thanks. 52a192362932 Revert "rt2800: use TXOP_BACKOFF for probe frames"
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c index a6884e73d2ab..7ddee980048b 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c @@ -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;
This reverts commit fb47ada8dc3c30c8e7b415da155742b49536c61e. 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: Stanislaw Gruszka <sgruszka@redhat.com> --- drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)