mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-07 14:28:50 +00:00
439ac8104b
Import patches from upstream to sync 19.07 with master: 9f3e3323e996 rt2x00: allow to specify watchdog interval 2034afe4db4a rt2800: add helpers for reading dma done index 759c5b599cf4 rt2800: initial watchdog implementation 09db3b000619 rt2800: add pre_reset_hw callback 710e6cc1595e rt2800: do not nullify initialization vector data e403fa31ed71 rt2x00: add restart hw 0f47aeeada2a rt2800: do not enable watchdog by default 41a531ffa4c5 rt2x00usb: fix rx queue hang 3b902fa811cf rt2x00usb: remove unnecessary rx flag checks 1dc244064c47 rt2x00: no need to check return value of debugfs_create functions 706f0182b1ad rt2800usb: Add new rt2800usb device PLANEX GW-USMicroN 95844124385e rt2x00: clear IV's on start to fix AP mode regression 567a9b766b47 rt2x00: do not set IEEE80211_TX_STAT_AMPDU_NO_BACK on tx status 14d5e14c8a6c rt2x00: clear up IV's on key removal 13fa451568ab Revert "rt2800: enable TX_PIN_CFG_LNA_PE_ bits per band" --pending-- rt2800: remove errornous duplicate condition Signed-off-by: Daniel Golle <daniel@makrotopia.org>
52 lines
2.0 KiB
Diff
52 lines
2.0 KiB
Diff
From 3b902fa811cf6bf7f9ad0ffb77d0a133e0b3bd61 Mon Sep 17 00:00:00 2001
|
|
From: Soeren Moch <smoch@web.de>
|
|
Date: Mon, 1 Jul 2019 12:53:14 +0200
|
|
Subject: [PATCH 09/15] rt2x00usb: remove unnecessary rx flag checks
|
|
|
|
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>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 9 +++------
|
|
1 file changed, 3 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
|
|
@@ -360,8 +360,7 @@ static void rt2x00usb_work_rxdone(struct
|
|
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;
|
|
|
|
/*
|
|
@@ -400,8 +399,7 @@ static void rt2x00usb_interrupt_rxdone(s
|
|
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);
|
|
}
|
|
@@ -413,8 +411,7 @@ static bool rt2x00usb_kick_rx_entry(stru
|
|
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);
|