| From foo@baz Thu Nov 9 09:48:01 CET 2017 |
| From: Stanislaw Gruszka <sgruszka@redhat.com> |
| Date: Fri, 6 Jan 2017 14:05:16 +0100 |
| Subject: rt2800usb: mark tx failure on timeout |
| |
| From: Stanislaw Gruszka <sgruszka@redhat.com> |
| |
| |
| [ Upstream commit 1701221696764b6861d0ee66850812a8900b9b9b ] |
| |
| If we do not get TX status in reasonable time, we most likely fail to |
| send frame hence mark it as so. |
| |
| Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> |
| Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
| Signed-off-by: Sasha Levin <alexander.levin@verizon.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 5 ++--- |
| 1 file changed, 2 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/net/wireless/ralink/rt2x00/rt2800usb.c |
| +++ b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c |
| @@ -646,10 +646,9 @@ static void rt2800usb_txdone_nostatus(st |
| !test_bit(ENTRY_DATA_STATUS_PENDING, &entry->flags)) |
| break; |
| |
| - if (test_bit(ENTRY_DATA_IO_FAILED, &entry->flags)) |
| + if (test_bit(ENTRY_DATA_IO_FAILED, &entry->flags) || |
| + rt2800usb_entry_txstatus_timeout(entry)) |
| rt2x00lib_txdone_noinfo(entry, TXDONE_FAILURE); |
| - else if (rt2800usb_entry_txstatus_timeout(entry)) |
| - rt2x00lib_txdone_noinfo(entry, TXDONE_UNKNOWN); |
| else |
| break; |
| } |
