2023-02-10 11:16:57

by Sascha Hauer

Subject: [PATCH v2 3/3] wifi: rtw88: usb: drop now unnecessary URB size check

Now that we send URBs with the URB_ZERO_PACKET flag set we no longer
need to make sure that the URB sizes are not multiple of the
bulkout_size. Drop the check.

Signed-off-by: Sascha Hauer <[email protected]>
---
drivers/net/wireless/realtek/rtw88/usb.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c
index 1a09c9288198a..2a8336b1847a5 100644
--- a/drivers/net/wireless/realtek/rtw88/usb.c
+++ b/drivers/net/wireless/realtek/rtw88/usb.c
@@ -414,24 +414,11 @@ static int rtw_usb_write_data_rsvd_page(struct rtw_dev *rtwdev, u8 *buf,
u32 size)
{
const struct rtw_chip_info *chip = rtwdev->chip;
- struct rtw_usb *rtwusb;
struct rtw_tx_pkt_info pkt_info = {0};
- u32 len, desclen;
-
- rtwusb = rtw_get_usb_priv(rtwdev);

pkt_info.tx_pkt_size = size;
pkt_info.qsel = TX_DESC_QSEL_BEACON;
-
- desclen = chip->tx_pkt_desc_sz;
- len = desclen + size;
- if (len % rtwusb->bulkout_size == 0) {
- len += RTW_USB_PACKET_OFFSET_SZ;
- pkt_info.offset = desclen + RTW_USB_PACKET_OFFSET_SZ;
- pkt_info.pkt_offset = 1;
- } else {
- pkt_info.offset = desclen;
- }
+ pkt_info.offset = chip->tx_pkt_desc_sz;

return rtw_usb_write_data(rtwdev, &pkt_info, buf);
}
--
2.30.2

2023-02-13 02:52:21

by Ping-Ke Shih

Subject: RE: [PATCH v2 3/3] wifi: rtw88: usb: drop now unnecessary URB size check

> -----Original Message-----
> From: Sascha Hauer <[email protected]>
> Sent: Friday, February 10, 2023 7:17 PM
> To: [email protected]
> Cc: Neo Jou <[email protected]>; Hans Ulli Kroll <[email protected]>; Ping-Ke Shih <[email protected]>;
> Yan-Hsuan Chuang <[email protected]>; Kalle Valo <[email protected]>; [email protected];
> [email protected]; Martin Blumenstingl <[email protected]>;
> [email protected]; Alexander Hochbaum <[email protected]>; Da Xue <[email protected]>; Bernie Huang
> <[email protected]>; Andreas Henriksson <[email protected]>; Viktor Petrenko <[email protected]>; Sascha
> Hauer <[email protected]>
> Subject: [PATCH v2 3/3] wifi: rtw88: usb: drop now unnecessary URB size check
>
> Now that we send URBs with the URB_ZERO_PACKET flag set we no longer
> need to make sure that the URB sizes are not multiple of the
> bulkout_size. Drop the check.
>
> Signed-off-by: Sascha Hauer <[email protected]>

Reviewed-by: Ping-Ke Shih <[email protected]>

> ---
> drivers/net/wireless/realtek/rtw88/usb.c | 15 +--------------
> 1 file changed, 1 insertion(+), 14 deletions(-)
>
> diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c
> index 1a09c9288198a..2a8336b1847a5 100644
> --- a/drivers/net/wireless/realtek/rtw88/usb.c
> +++ b/drivers/net/wireless/realtek/rtw88/usb.c
> @@ -414,24 +414,11 @@ static int rtw_usb_write_data_rsvd_page(struct rtw_dev *rtwdev, u8 *buf,
> u32 size)
> {
> const struct rtw_chip_info *chip = rtwdev->chip;
> - struct rtw_usb *rtwusb;
> struct rtw_tx_pkt_info pkt_info = {0};
> - u32 len, desclen;
> -
> - rtwusb = rtw_get_usb_priv(rtwdev);
>
> pkt_info.tx_pkt_size = size;
> pkt_info.qsel = TX_DESC_QSEL_BEACON;
> -
> - desclen = chip->tx_pkt_desc_sz;
> - len = desclen + size;
> - if (len % rtwusb->bulkout_size == 0) {
> - len += RTW_USB_PACKET_OFFSET_SZ;
> - pkt_info.offset = desclen + RTW_USB_PACKET_OFFSET_SZ;
> - pkt_info.pkt_offset = 1;
> - } else {
> - pkt_info.offset = desclen;
> - }
> + pkt_info.offset = chip->tx_pkt_desc_sz;
>
> return rtw_usb_write_data(rtwdev, &pkt_info, buf);
> }
> --
> 2.30.2