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

Commit e3a3cd87 authored by Daniel Halperin's avatar Daniel Halperin Committed by Reinette Chatre
Browse files

iwlwifi: set AMPDU status variables correctly 



The TX status code is currently abusing the ampdu_ack_map field (a bitmap) to
count the number of successfully received frames.  The comments in mac80211.h
show there are actually three different, relevant variables, of which we are
currently using two, both incorrectly. Fix this by making

- ampdu_ack_len -> the number of ACKed frames (i.e. successes)
- ampdu_ack_map -> the bitmap
- ampdu_len -> the total number of frames sent (i.e., attempts)

to match the header file (and verified with ath9k's usage) and updating Intel's
RS code to match.

Signed-off-by: default avatarDaniel Halperin <dhalperi@cs.washington.edu>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent 17f36fc6

drivers/net/wireless/iwlwifi/iwl-agn-rs.c

+5 −5
Original line number Diff line number Diff line
@@ -867,14 +867,14 @@ static void rs_tx_status(void *priv_r, struct ieee80211_supported_band *sband, 
		rs_get_tbl_info_from_mcs(tx_rate, priv->band, &tbl_type,

				&rs_index);

		rs_collect_tx_data(curr_tbl, rs_index,

				   info->status.ampdu_ack_len,

				   info->status.ampdu_ack_map);

				   info->status.ampdu_len,

				   info->status.ampdu_ack_len);



		/* Update success/fail counts if not searching for new mode */

		if (lq_sta->stay_in_tbl) {

			lq_sta->total_success += info->status.ampdu_ack_map;

			lq_sta->total_failed += (info->status.ampdu_ack_len -

					info->status.ampdu_ack_map);

			lq_sta->total_success += info->status.ampdu_ack_len;

			lq_sta->total_failed += (info->status.ampdu_len -

					info->status.ampdu_ack_len);

		}

	} else {

	/*

drivers/net/wireless/iwlwifi/iwl-agn-tx.c

+3 −2
Original line number Diff line number Diff line
@@ -1233,8 +1233,9 @@ static int iwlagn_tx_status_reply_compressed_ba(struct iwl_priv *priv, 
	memset(&info->status, 0, sizeof(info->status));

	info->flags |= IEEE80211_TX_STAT_ACK;

	info->flags |= IEEE80211_TX_STAT_AMPDU;

	info->status.ampdu_ack_map = successes;

	info->status.ampdu_ack_len = agg->frame_count;

	info->status.ampdu_ack_len = successes;

	info->status.ampdu_ack_map = bitmap;

	info->status.ampdu_len = agg->frame_count;

	iwlagn_hwrate_to_tx_control(priv, agg->rate_n_flags, info);



	IWL_DEBUG_TX_REPLY(priv, "Bitmap %llx\n", (unsigned long long)bitmap);