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

Commit 2e27cff8 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Fix TX status reporting 



Not all values of the TX status enumeration were
covered during updating of the TX statistics. This
could lead to wrong bitrate tuning but also wrong
behavior in tools like hostapd.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1ee50cd9

drivers/net/wireless/rt2x00/rt2x00dev.c

+16 −12
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ void rt2x00lib_txdone(struct queue_entry *entry, 
	unsigned int header_length = ieee80211_get_hdrlen_from_skb(entry->skb);

	u8 rate_idx, rate_flags, retry_rates;

	unsigned int i;

	bool success;



	/*

	 * Unmap the skb.
@@ -234,13 +235,18 @@ void rt2x00lib_txdone(struct queue_entry *entry, 
	rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_TXDONE, entry->skb);



	/*

	 * Update TX statistics.

	 * Determine if the frame has been successfully transmitted.

	 */

	rt2x00dev->link.qual.tx_success +=

	success =

	    test_bit(TXDONE_SUCCESS, &txdesc->flags) ||

	    test_bit(TXDONE_UNKNOWN, &txdesc->flags);

	rt2x00dev->link.qual.tx_failed +=

	    test_bit(TXDONE_FAILURE, &txdesc->flags);

	    test_bit(TXDONE_UNKNOWN, &txdesc->flags) ||

	    test_bit(TXDONE_FALLBACK, &txdesc->flags);



	/*

	 * Update TX statistics.

	 */

	rt2x00dev->link.qual.tx_success += success;

	rt2x00dev->link.qual.tx_failed += !success;



	rate_idx = skbdesc->tx_rate_idx;

	rate_flags = skbdesc->tx_rate_flags;
@@ -267,18 +273,16 @@ void rt2x00lib_txdone(struct queue_entry *entry, 
		tx_info->status.rates[i].idx = -1; /* terminate */



	if (!(tx_info->flags & IEEE80211_TX_CTL_NO_ACK)) {

		if (test_bit(TXDONE_SUCCESS, &txdesc->flags) ||

				test_bit(TXDONE_UNKNOWN, &txdesc->flags))

		if (success)

			tx_info->flags |= IEEE80211_TX_STAT_ACK;

		else if (test_bit(TXDONE_FAILURE, &txdesc->flags))

		else

			rt2x00dev->low_level_stats.dot11ACKFailureCount++;

	}



	if (rate_flags & IEEE80211_TX_RC_USE_RTS_CTS) {

		if (test_bit(TXDONE_SUCCESS, &txdesc->flags) ||

				test_bit(TXDONE_UNKNOWN, &txdesc->flags))

		if (success)

			rt2x00dev->low_level_stats.dot11RTSSuccessCount++;

		else if (test_bit(TXDONE_FAILURE, &txdesc->flags))

		else

			rt2x00dev->low_level_stats.dot11RTSFailureCount++;

	}