提交 7682a76d 编写于 作者: L Luis R. Rodriguez 提交者: John W. Linville

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: NLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 201c3b41
...@@ -777,7 +777,6 @@ static void ath_rc_rate_set_rtscts(struct ath_softc *sc, ...@@ -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. * just CTS. Note that this is only done for OFDM/HT unicast frames.
*/ */
if ((sc->sc_flags & SC_OP_PROTECT_ENABLE) && 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 || (rate_table->info[rix].phy == WLAN_RC_PHY_OFDM ||
WLAN_RC_PHY_HT(rate_table->info[rix].phy))) { WLAN_RC_PHY_HT(rate_table->info[rix].phy))) {
rates[0].flags |= IEEE80211_TX_RC_USE_CTS_PROTECT; rates[0].flags |= IEEE80211_TX_RC_USE_CTS_PROTECT;
...@@ -882,9 +881,8 @@ static void ath_rc_ratefind(struct ath_softc *sc, ...@@ -882,9 +881,8 @@ static void ath_rc_ratefind(struct ath_softc *sc,
* *
* FIXME: Fix duration * FIXME: Fix duration
*/ */
if (!(tx_info->flags & IEEE80211_TX_CTL_NO_ACK) && if (ieee80211_has_morefrags(fc) ||
(ieee80211_has_morefrags(fc) || (le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG)) {
(le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG))) {
rates[1].count = rates[2].count = rates[3].count = 0; rates[1].count = rates[2].count = rates[3].count = 0;
rates[1].idx = rates[2].idx = rates[3].idx = 0; rates[1].idx = rates[2].idx = rates[3].idx = 0;
rates[0].count = ATH_TXMAXTRY; rates[0].count = ATH_TXMAXTRY;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册