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

Commit ec80ad70 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Kalle Valo
Browse files

rt2x00: fixup fill_tx_status for nomatch case 



Add bits rt2x00lib_fill_tx_status() when filling status in nomatch
case and hopefully do not break the function for existing cases.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent a09305d0

drivers/net/wireless/ralink/rt2x00/rt2x00dev.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -357,6 +357,9 @@ static void rt2x00lib_fill_tx_status(struct rt2x00_dev *rt2x00dev, 
	if (i < (IEEE80211_TX_MAX_RATES - 1))

	if (i < (IEEE80211_TX_MAX_RATES - 1))

		tx_info->status.rates[i].idx = -1; /* terminate */

		tx_info->status.rates[i].idx = -1; /* terminate */





	if (test_bit(TXDONE_NO_ACK_REQ, &txdesc->flags))

		tx_info->flags |= IEEE80211_TX_CTL_NO_ACK;



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

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

		if (success)

		if (success)

			tx_info->flags |= IEEE80211_TX_STAT_ACK;

			tx_info->flags |= IEEE80211_TX_STAT_ACK;
@@ -375,7 +378,8 @@ static void rt2x00lib_fill_tx_status(struct rt2x00_dev *rt2x00dev, 
	 */

	 */

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

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

	    tx_info->flags & IEEE80211_TX_CTL_AMPDU) {

	    tx_info->flags & IEEE80211_TX_CTL_AMPDU) {

		tx_info->flags |= IEEE80211_TX_STAT_AMPDU;

		tx_info->flags |= IEEE80211_TX_STAT_AMPDU |

				  IEEE80211_TX_CTL_AMPDU;

		tx_info->status.ampdu_len = 1;

		tx_info->status.ampdu_len = 1;

		tx_info->status.ampdu_ack_len = success ? 1 : 0;

		tx_info->status.ampdu_ack_len = success ? 1 : 0;

drivers/net/wireless/ralink/rt2x00/rt2x00queue.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -215,6 +215,7 @@ enum txdone_entry_desc_flags { 
	TXDONE_FAILURE,

	TXDONE_FAILURE,

	TXDONE_EXCESSIVE_RETRY,

	TXDONE_EXCESSIVE_RETRY,

	TXDONE_AMPDU,

	TXDONE_AMPDU,

	TXDONE_NO_ACK_REQ,

};

};





/**

/**