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

Commit 7682a76d authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

ath9k: remove unnecessary IEEE80211_TX_CTL_NO_ACK checks 



We check for this condition early on in our mac80211 get_rate()
callback ath_get_rate(), so remove this check later down the path.

Cc: Derek Smithies <derek@indranet.co.nz>
Cc: Chittajit Mitra <Chittajit.Mitra@Atheros.com>
Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 201c3b41

drivers/net/wireless/ath/ath9k/rc.c

+2 −4
Original line number Diff line number Diff line
@@ -777,7 +777,6 @@ static void ath_rc_rate_set_rtscts(struct ath_softc *sc, 
	 * just CTS.  Note that this is only done for OFDM/HT unicast frames.

	 */

	if ((sc->sc_flags & SC_OP_PROTECT_ENABLE) &&

	    !(tx_info->flags & IEEE80211_TX_CTL_NO_ACK) &&

	    (rate_table->info[rix].phy == WLAN_RC_PHY_OFDM ||

	     WLAN_RC_PHY_HT(rate_table->info[rix].phy))) {

		rates[0].flags |= IEEE80211_TX_RC_USE_CTS_PROTECT;
@@ -882,9 +881,8 @@ static void ath_rc_ratefind(struct ath_softc *sc, 
	 *

	 * FIXME: Fix duration

	 */

	if (!(tx_info->flags & IEEE80211_TX_CTL_NO_ACK) &&

	    (ieee80211_has_morefrags(fc) ||

	     (le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG))) {

	if (ieee80211_has_morefrags(fc) ||

	    (le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG)) {

		rates[1].count = rates[2].count = rates[3].count = 0;

		rates[1].idx = rates[2].idx = rates[3].idx = 0;

		rates[0].count = ATH_TXMAXTRY;