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

Commit 8da3efbb authored by Helmut Schaa's avatar Helmut Schaa Committed by John W. Linville
Browse files

rt2x00: Use TXOP_HTTXOP for beacons 



Use TXOP_HTTXOP for beacons to stay in sync with the legacy drivers.

Signed-off-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 961636ba

drivers/net/wireless/rt2x00/rt2x00ht.c

+3 −2
Original line number Diff line number Diff line
@@ -92,14 +92,15 @@ void rt2x00ht_create_tx_descriptor(struct queue_entry *entry, 


	/*

	 * Determine IFS values

	 * - Use TXOP_BACKOFF for management frames

	 * - 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))

	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;