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

Commit c397bf15 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f513dfff

drivers/net/wireless/iwlwifi/iwl-4965.c

+2 −4
Original line number Diff line number Diff line
@@ -1864,8 +1864,7 @@ static int iwl4965_tx_status_reply_tx(struct iwl_priv *priv, 
		info = IEEE80211_SKB_CB(priv->txq[txq_id].txb[idx].skb[0]);

		info->status.rates[0].count = tx_resp->failure_frame + 1;

		info->flags &= ~IEEE80211_TX_CTL_AMPDU;

		info->flags |= iwl_is_tx_success(status) ?

			IEEE80211_TX_STAT_ACK : 0;

		info->flags |= iwl_tx_status_to_mac80211(status);

		iwl_hwrate_to_tx_control(priv, rate_n_flags, info);

		/* FIXME: code repetition end */
@@ -2020,8 +2019,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, 
		}

	} else {

		info->status.rates[0].count = tx_resp->failure_frame + 1;

		info->flags |= iwl_is_tx_success(status) ?

					IEEE80211_TX_STAT_ACK : 0;

		info->flags |= iwl_tx_status_to_mac80211(status);

		iwl_hwrate_to_tx_control(priv,

					le32_to_cpu(tx_resp->rate_n_flags),

					info);

drivers/net/wireless/iwlwifi/iwl-5000.c

+2 −4
Original line number Diff line number Diff line
@@ -993,8 +993,7 @@ static int iwl5000_tx_status_reply_tx(struct iwl_priv *priv, 
		info = IEEE80211_SKB_CB(priv->txq[txq_id].txb[idx].skb[0]);

		info->status.rates[0].count = tx_resp->failure_frame + 1;

		info->flags &= ~IEEE80211_TX_CTL_AMPDU;

		info->flags |= iwl_is_tx_success(status) ?

					IEEE80211_TX_STAT_ACK : 0;

		info->flags |= iwl_tx_status_to_mac80211(status);

		iwl_hwrate_to_tx_control(priv, rate_n_flags, info);



		/* FIXME: code repetition end */
@@ -1139,8 +1138,7 @@ static void iwl5000_rx_reply_tx(struct iwl_priv *priv, 
		BUG_ON(txq_id != txq->swq_id);



		info->status.rates[0].count = tx_resp->failure_frame + 1;

		info->flags |= iwl_is_tx_success(status) ?

					IEEE80211_TX_STAT_ACK : 0;

		info->flags |= iwl_tx_status_to_mac80211(status);

		iwl_hwrate_to_tx_control(priv,

					le32_to_cpu(tx_resp->rate_n_flags),

					info);

drivers/net/wireless/iwlwifi/iwl-commands.h

+15 −0
Original line number Diff line number Diff line
@@ -1690,6 +1690,21 @@ enum { 
	TX_ABORT_REQUIRED_MSK = 0x80000000,	/* bits 31:31 */

};



static inline u32 iwl_tx_status_to_mac80211(u32 status)

{

	status &= TX_STATUS_MSK;



	switch (status) {

	case TX_STATUS_SUCCESS:

	case TX_STATUS_DIRECT_DONE:

		return IEEE80211_TX_STAT_ACK;

	case TX_STATUS_FAIL_DEST_PS:

		return IEEE80211_TX_STAT_TX_FILTERED;

	default:

		return 0;

	}

}



static inline bool iwl_is_tx_success(u32 status)

{

	status &= TX_STATUS_MSK;