diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-5000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index 48982fb44995..570eaa08531f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
| @@ -993,8 +993,7 @@ static int iwl5000_tx_status_reply_tx(struct iwl_priv *priv, | |||
| 993 | info = IEEE80211_SKB_CB(priv->txq[txq_id].txb[idx].skb[0]); | 993 | info = IEEE80211_SKB_CB(priv->txq[txq_id].txb[idx].skb[0]); |
| 994 | info->status.rates[0].count = tx_resp->failure_frame + 1; | 994 | info->status.rates[0].count = tx_resp->failure_frame + 1; |
| 995 | info->flags &= ~IEEE80211_TX_CTL_AMPDU; | 995 | info->flags &= ~IEEE80211_TX_CTL_AMPDU; |
| 996 | info->flags |= iwl_is_tx_success(status) ? | 996 | info->flags |= iwl_tx_status_to_mac80211(status); |
| 997 | IEEE80211_TX_STAT_ACK : 0; | ||
| 998 | iwl_hwrate_to_tx_control(priv, rate_n_flags, info); | 997 | iwl_hwrate_to_tx_control(priv, rate_n_flags, info); |
| 999 | 998 | ||
| 1000 | /* FIXME: code repetition end */ | 999 | /* FIXME: code repetition end */ |
| @@ -1139,8 +1138,7 @@ static void iwl5000_rx_reply_tx(struct iwl_priv *priv, | |||
| 1139 | BUG_ON(txq_id != txq->swq_id); | 1138 | BUG_ON(txq_id != txq->swq_id); |
| 1140 | 1139 | ||
| 1141 | info->status.rates[0].count = tx_resp->failure_frame + 1; | 1140 | info->status.rates[0].count = tx_resp->failure_frame + 1; |
| 1142 | info->flags |= iwl_is_tx_success(status) ? | 1141 | info->flags |= iwl_tx_status_to_mac80211(status); |
| 1143 | IEEE80211_TX_STAT_ACK : 0; | ||
| 1144 | iwl_hwrate_to_tx_control(priv, | 1142 | iwl_hwrate_to_tx_control(priv, |
| 1145 | le32_to_cpu(tx_resp->rate_n_flags), | 1143 | le32_to_cpu(tx_resp->rate_n_flags), |
| 1146 | info); | 1144 | info); |