diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 1d22ea390c00..0efde87b4597 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -1864,8 +1864,7 @@ static int iwl4965_tx_status_reply_tx(struct iwl_priv *priv, | |||
1864 | info = IEEE80211_SKB_CB(priv->txq[txq_id].txb[idx].skb[0]); | 1864 | info = IEEE80211_SKB_CB(priv->txq[txq_id].txb[idx].skb[0]); |
1865 | info->status.rates[0].count = tx_resp->failure_frame + 1; | 1865 | info->status.rates[0].count = tx_resp->failure_frame + 1; |
1866 | info->flags &= ~IEEE80211_TX_CTL_AMPDU; | 1866 | info->flags &= ~IEEE80211_TX_CTL_AMPDU; |
1867 | info->flags |= iwl_is_tx_success(status) ? | 1867 | info->flags |= iwl_tx_status_to_mac80211(status); |
1868 | IEEE80211_TX_STAT_ACK : 0; | ||
1869 | iwl_hwrate_to_tx_control(priv, rate_n_flags, info); | 1868 | iwl_hwrate_to_tx_control(priv, rate_n_flags, info); |
1870 | /* FIXME: code repetition end */ | 1869 | /* FIXME: code repetition end */ |
1871 | 1870 | ||
@@ -2020,8 +2019,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, | |||
2020 | } | 2019 | } |
2021 | } else { | 2020 | } else { |
2022 | info->status.rates[0].count = tx_resp->failure_frame + 1; | 2021 | info->status.rates[0].count = tx_resp->failure_frame + 1; |
2023 | info->flags |= iwl_is_tx_success(status) ? | 2022 | info->flags |= iwl_tx_status_to_mac80211(status); |
2024 | IEEE80211_TX_STAT_ACK : 0; | ||
2025 | iwl_hwrate_to_tx_control(priv, | 2023 | iwl_hwrate_to_tx_control(priv, |
2026 | le32_to_cpu(tx_resp->rate_n_flags), | 2024 | le32_to_cpu(tx_resp->rate_n_flags), |
2027 | info); | 2025 | info); |