Skip to content

Commit fb47ada

Browse files
Stanislaw GruszkaKalle Valo
authored andcommitted
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 <[email protected]> Signed-off-by: Kalle Valo <[email protected]>
1 parent 9d7a7a4 commit fb47ada

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,15 +372,16 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev,
372372

373373
/*
374374
* Determine IFS values
375-
* - Use TXOP_BACKOFF for management frames except beacons
375+
* - Use TXOP_BACKOFF for probe and management frames except beacons
376376
* - Use TXOP_SIFS for fragment bursts
377377
* - Use TXOP_HTTXOP for everything else
378378
*
379379
* Note: rt2800 devices won't use CTS protection (if used)
380380
* for frames not transmitted with TXOP_HTTXOP
381381
*/
382-
if (ieee80211_is_mgmt(hdr->frame_control) &&
383-
!ieee80211_is_beacon(hdr->frame_control))
382+
if ((ieee80211_is_mgmt(hdr->frame_control) &&
383+
!ieee80211_is_beacon(hdr->frame_control)) ||
384+
(tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE))
384385
txdesc->u.ht.txop = TXOP_BACKOFF;
385386
else if (!(tx_info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT))
386387
txdesc->u.ht.txop = TXOP_SIFS;

0 commit comments

Comments
 (0)