| Message ID | 20190701105314.9707-2-smoch@web.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3b902fa811cf6bf7f9ad0ffb77d0a133e0b3bd61 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [v2,1/2] rt2x00usb: fix rx queue hang | expand |
On Mon, Jul 01, 2019 at 12:53:14PM +0200, Soeren Moch wrote: > In contrast to the TX path, there is no need to separately read the transfer > status from the device after receiving RX data. Consequently, there is no > real STATUS_PENDING RX processing queue entry state. > Remove the unnecessary ENTRY_DATA_STATUS_PENDING flag checks from the RX path. > Also remove the misleading comment about reading RX status from device. > > Suggested-by: Stanislaw Gruszka <sgruszka@redhat.com> > Signed-off-by: Soeren Moch <smoch@web.de> Acked-by: Stanislaw Gruszka <sgruszka@redhat.com>
Soeren Moch <smoch@web.de> wrote: > In contrast to the TX path, there is no need to separately read the transfer > status from the device after receiving RX data. Consequently, there is no > real STATUS_PENDING RX processing queue entry state. > Remove the unnecessary ENTRY_DATA_STATUS_PENDING flag checks from the RX path. > Also remove the misleading comment about reading RX status from device. > > Suggested-by: Stanislaw Gruszka <sgruszka@redhat.com> > Signed-off-by: Soeren Moch <smoch@web.de> > Acked-by: Stanislaw Gruszka <sgruszka@redhat.com> Patch applied to wireless-drivers-next.git, thanks. 3b902fa811cf rt2x00usb: remove unnecessary rx flag checks
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c index 7e3a621b9c0d..bc2dfef0de22 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c @@ -349,8 +349,7 @@ static void rt2x00usb_work_rxdone(struct work_struct *work) while (!rt2x00queue_empty(rt2x00dev->rx)) { entry = rt2x00queue_get_entry(rt2x00dev->rx, Q_INDEX_DONE); - if (test_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags) || - !test_bit(ENTRY_DATA_STATUS_PENDING, &entry->flags)) + if (test_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags)) break; /* @@ -389,8 +388,7 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb) rt2x00lib_dmadone(entry); /* - * Schedule the delayed work for reading the RX status - * from the device. + * Schedule the delayed work for processing RX data */ queue_work(rt2x00dev->workqueue, &rt2x00dev->rxdone_work); } @@ -402,8 +400,7 @@ static bool rt2x00usb_kick_rx_entry(struct queue_entry *entry, void *data) struct queue_entry_priv_usb *entry_priv = entry->priv_data; int status; - if (test_and_set_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags) || - test_bit(ENTRY_DATA_STATUS_PENDING, &entry->flags)) + if (test_and_set_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags)) return false; rt2x00lib_dmastart(entry);
In contrast to the TX path, there is no need to separately read the transfer status from the device after receiving RX data. Consequently, there is no real STATUS_PENDING RX processing queue entry state. Remove the unnecessary ENTRY_DATA_STATUS_PENDING flag checks from the RX path. Also remove the misleading comment about reading RX status from device. Suggested-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: Soeren Moch <smoch@web.de> --- Changes in v2: new patch Cc: Stanislaw Gruszka <sgruszka@redhat.com> Cc: Helmut Schaa <helmut.schaa@googlemail.com> Cc: Kalle Valo <kvalo@codeaurora.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) -- 2.17.1