aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-4965.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-11-13 14:56:35 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-11-18 17:09:07 -0500
commitc397bf15a6067ecf39f8a771907f4721a64fd61f (patch)
treeef9e1d748335602699b94ec69b436894494bfac8 /drivers/net/wireless/iwlwifi/iwl-4965.c
parentf513dfff9622ac72c461770e1fa01d291ba6ba5a (diff)
iwlwifi: report PS filtered status
When a frame is sent to a sleeping station, the microcode reports TX_STATUS_FAIL_DEST_PS as its status -- we need to translate that to the flag that mac80211 expects. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965.c6
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 1d22ea390c0..0efde87b459 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);