Re: [PATCH 1/2] staging: rtl8192u: fix control-message timeouts

[Larry Finger <Larry.Finger@xxxxxxxxxxxx>]

On 10/25/21 07:09, Johan Hovold wrote:
> USB control-message timeouts are specified in milliseconds and should
> specifically not vary with CONFIG_HZ.
>
> Fixes: 8fc8598e61f6 ("Staging: Added Realtek rtl8192u driver to staging")
> Cc: stable@xxxxxxxxxxxxxxx      # 2.6.33
> Signed-off-by: Johan Hovold <johan@xxxxxxxxxx>
> ---
>   drivers/staging/rtl8192u/r8192U_core.c | 18 +++++++++---------
>   1 file changed, 9 insertions(+), 9 deletions(-)

I would have preferred that you not use the magic number "500", but the patch is OK.

Acked-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>

Larry

> diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
> index b6698656fc01..cf5cfee2936f 100644
> --- a/drivers/staging/rtl8192u/r8192U_core.c
> +++ b/drivers/staging/rtl8192u/r8192U_core.c
> @@ -229,7 +229,7 @@ int write_nic_byte_E(struct net_device *dev, int indx, u8 data)
>   
>   	status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
>   				 RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
> -				 indx | 0xfe00, 0, usbdata, 1, HZ / 2);
> +				 indx | 0xfe00, 0, usbdata, 1, 500);
>   	kfree(usbdata);
>   
>   	if (status < 0) {
> @@ -251,7 +251,7 @@ int read_nic_byte_E(struct net_device *dev, int indx, u8 *data)
>   
>   	status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>   				 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
> -				 indx | 0xfe00, 0, usbdata, 1, HZ / 2);
> +				 indx | 0xfe00, 0, usbdata, 1, 500);
>   	*data = *usbdata;
>   	kfree(usbdata);
>   
> @@ -279,7 +279,7 @@ int write_nic_byte(struct net_device *dev, int indx, u8 data)
>   	status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
>   				 RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
>   				 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
> -				 usbdata, 1, HZ / 2);
> +				 usbdata, 1, 500);
>   	kfree(usbdata);
>   
>   	if (status < 0) {
> @@ -305,7 +305,7 @@ int write_nic_word(struct net_device *dev, int indx, u16 data)
>   	status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
>   				 RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
>   				 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
> -				 usbdata, 2, HZ / 2);
> +				 usbdata, 2, 500);
>   	kfree(usbdata);
>   
>   	if (status < 0) {
> @@ -331,7 +331,7 @@ int write_nic_dword(struct net_device *dev, int indx, u32 data)
>   	status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
>   				 RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
>   				 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
> -				 usbdata, 4, HZ / 2);
> +				 usbdata, 4, 500);
>   	kfree(usbdata);
>   
>   	if (status < 0) {
> @@ -355,7 +355,7 @@ int read_nic_byte(struct net_device *dev, int indx, u8 *data)
>   	status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>   				 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
>   				 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
> -				 usbdata, 1, HZ / 2);
> +				 usbdata, 1, 500);
>   	*data = *usbdata;
>   	kfree(usbdata);
>   
> @@ -380,7 +380,7 @@ int read_nic_word(struct net_device *dev, int indx, u16 *data)
>   	status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>   				 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
>   				 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
> -				 usbdata, 2, HZ / 2);
> +				 usbdata, 2, 500);
>   	*data = *usbdata;
>   	kfree(usbdata);
>   
> @@ -404,7 +404,7 @@ static int read_nic_word_E(struct net_device *dev, int indx, u16 *data)
>   
>   	status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>   				 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
> -				 indx | 0xfe00, 0, usbdata, 2, HZ / 2);
> +				 indx | 0xfe00, 0, usbdata, 2, 500);
>   	*data = *usbdata;
>   	kfree(usbdata);
>   
> @@ -430,7 +430,7 @@ int read_nic_dword(struct net_device *dev, int indx, u32 *data)
>   	status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
>   				 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
>   				 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
> -				 usbdata, 4, HZ / 2);
> +				 usbdata, 4, 500);
>   	*data = *usbdata;
>   	kfree(usbdata);
>