leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rt2x00: fixup fill_tx_status for nomatch case

Browse Source 
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: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Stanislaw Gruszka 2017-02-15 10:25:09 +01:00 committed by Kalle Valo
parent a09305d052
commit ec80ad70d7
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
View File

@ -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;

1
drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
View File

@ -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,
}; };
/** /**