From 49a6469a59087056de1aaf01bf01bc801e8b79fa Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: Apr 17 2023 12:19:03 +0000 Subject: ath10k: fix control-message timeout (git-fixes). --- diff --git a/patches.suse/ath10k-fix-control-message-timeout.patch b/patches.suse/ath10k-fix-control-message-timeout.patch new file mode 100644 index 0000000..4d40be7 --- /dev/null +++ b/patches.suse/ath10k-fix-control-message-timeout.patch @@ -0,0 +1,38 @@ +From 5286132324230168d3fab6ffc16bfd7de85bdfb4 Mon Sep 17 00:00:00 2001 +From: Johan Hovold +Date: Mon, 25 Oct 2021 14:05:19 +0200 +Subject: [PATCH] ath10k: fix control-message timeout +Git-commit: 5286132324230168d3fab6ffc16bfd7de85bdfb4 +References: git-fixes +Patch-mainline: v5.16-rc1 + +USB control-message timeouts are specified in milliseconds and should +specifically not vary with CONFIG_HZ. + +Fixes: 4db66499df91 ("ath10k: add initial USB support") +Cc: stable@vger.kernel.org # 4.14 +Cc: Erik Stromdahl +Signed-off-by: Johan Hovold +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20211025120522.6045-2-johan@kernel.org +Signed-off-by: Oliver Neukum +--- + drivers/net/wireless/ath/ath10k/usb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/ath/ath10k/usb.c b/drivers/net/wireless/ath/ath10k/usb.c +index 19b9c27e30e2..6d831b098cbb 100644 +--- a/drivers/net/wireless/ath/ath10k/usb.c ++++ b/drivers/net/wireless/ath/ath10k/usb.c +@@ -525,7 +525,7 @@ static int ath10k_usb_submit_ctrl_in(struct ath10k *ar, + req, + USB_DIR_IN | USB_TYPE_VENDOR | + USB_RECIP_DEVICE, value, index, buf, +- size, 2 * HZ); ++ size, 2000); + + if (ret < 0) { + ath10k_warn(ar, "Failed to read usb control message: %d\n", +-- +2.40.0 + diff --git a/series.conf b/series.conf index 5a9ef17..3c26ed3 100644 --- a/series.conf +++ b/series.conf @@ -61739,6 +61739,7 @@ patches.suse/libertas-Fix-possible-memory-leak-in-probe-and-disco.patch patches.suse/wcn36xx-Fix-HT40-capability-for-2Ghz-band.patch patches.suse/wcn36xx-add-proper-DMA-memory-barriers-in-rx-path.patch + patches.suse/ath10k-fix-control-message-timeout.patch patches.suse/ath6kl-fix-control-message-timeout.patch patches.suse/ath6kl-fix-division-by-zero-in-send-path.patch patches.suse/rtl8187-fix-control-message-timeouts.patch