Commit 430df798 authored Feb 20, 2011 by Helmut Schaa Committed by John W. Linville Feb 21, 2011

rt2x00: Minor optimization for devices with RTS/CTS offload



Only devices that don't have RTS/CTS offload need to check for
IEEE80211_TX_RC_USE_RTS_CTS and IEEE80211_TX_RC_USE_CTS_PROTECT.

By swapping both conditions we keep the same number of needed conditionals
for devices without RTS/CTS offload but save one conditional on devices
with RTS/CTS offload.

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent e90c54b2

drivers/net/wireless/rt2x00/rt2x00mac.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -139,9 +139,9 @@ int rt2x00mac_tx(struct ieee80211_hw hw, struct sk_buff skb)
		* either RTS or CTS-to-self frame and handles everything
		* inside the hardware.
		*/
		if ((tx_info->control.rates[0].flags & (IEEE80211_TX_RC_USE_RTS_CTS \|
		IEEE80211_TX_RC_USE_CTS_PROTECT)) &&
		!rt2x00dev->ops->hw->set_rts_threshold) {
		if (!rt2x00dev->ops->hw->set_rts_threshold &&
		(tx_info->control.rates[0].flags & (IEEE80211_TX_RC_USE_RTS_CTS \|
		IEEE80211_TX_RC_USE_CTS_PROTECT))) {
		if (rt2x00queue_available(queue) <= 1)
		goto exit_fail;