From: Johan Hovold <johan@kernel.org>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: Herton Ronaldo Krzesinski <herton@canonical.com>,
Hin-Tak Leung <htl10@users.sourceforge.net>,
Larry Finger <Larry.Finger@lwfinger.net>,
Amitkumar Karwar <amitkarwar@gmail.com>,
Siva Rebbagondla <siva8118@gmail.com>,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
Johan Hovold <johan@kernel.org>,
stable@vger.kernel.org
Subject: [PATCH 4/4] rsi: fix control-message timeout
Date: Mon, 25 Oct 2021 14:05:22 +0200 [thread overview]
Message-ID: <20211025120522.6045-5-johan@kernel.org> (raw)
In-Reply-To: <20211025120522.6045-1-johan@kernel.org>
USB control-message timeouts are specified in milliseconds and should
specifically not vary with CONFIG_HZ.
Use the common control-message timeout define for the five-second
timeout.
Fixes: dad0d04fa7ba ("rsi: Add RS9113 wireless driver")
Cc: stable@vger.kernel.org # 3.15
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/net/wireless/rsi/rsi_91x_usb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c
index 416976f09888..e97f92915ed9 100644
--- a/drivers/net/wireless/rsi/rsi_91x_usb.c
+++ b/drivers/net/wireless/rsi/rsi_91x_usb.c
@@ -61,7 +61,7 @@ static int rsi_usb_card_write(struct rsi_hw *adapter,
(void *)seg,
(int)len,
&transfer,
- HZ * 5);
+ USB_CTRL_SET_TIMEOUT);
if (status < 0) {
rsi_dbg(ERR_ZONE,
--
2.32.0
prev parent reply other threads:[~2021-10-25 12:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-25 12:05 [PATCH 0/4] wireless: fix control-message timeouts Johan Hovold
2021-10-25 12:05 ` [PATCH 1/4] ath10k: fix control-message timeout Johan Hovold
2021-10-28 7:33 ` Kalle Valo
2021-10-25 12:05 ` [PATCH 2/4] ath6kl: " Johan Hovold
2021-10-25 12:05 ` [PATCH 3/4] rtl8187: fix control-message timeouts Johan Hovold
2021-10-28 13:26 ` Kalle Valo
2021-10-25 12:05 ` Johan Hovold [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211025120522.6045-5-johan@kernel.org \
--to=johan@kernel.org \
--cc=Larry.Finger@lwfinger.net \
--cc=amitkarwar@gmail.com \
--cc=herton@canonical.com \
--cc=htl10@users.sourceforge.net \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=siva8118@gmail.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).