From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: stable@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
patches@lists.linux.dev, Sascha Hauer <s.hauer@pengutronix.de>,
Ping-Ke Shih <pkshih@realtek.com>, Kalle Valo <kvalo@kernel.org>
Subject: [PATCH 6.2 10/16] wifi: rtw88: usb: drop now unnecessary URB size check
Date: Wed, 1 Mar 2023 19:07:46 +0100 [thread overview]
Message-ID: <20230301180653.670493262@linuxfoundation.org> (raw)
In-Reply-To: <20230301180653.263532453@linuxfoundation.org>
From: Sascha Hauer <s.hauer@pengutronix.de>
commit 462c8db6a01160836c68e262d25566f2447148d9 upstream.
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 <s.hauer@pengutronix.de>
Reviewed-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230210111632.1985205-4-s.hauer@pengutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/net/wireless/realtek/rtw88/usb.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
--- 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(
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);
}
next prev parent reply other threads:[~2023-03-01 18:08 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-01 18:07 [PATCH 6.2 00/16] 6.2.2-rc1 review Greg Kroah-Hartman
2023-03-01 18:07 ` [PATCH 6.2 01/16] ALSA: hda: cs35l41: Correct error condition handling Greg Kroah-Hartman
2023-03-01 18:07 ` [PATCH 6.2 02/16] crypto: arm64/sm4-gcm - Fix possible crash in GCM cryption Greg Kroah-Hartman
2023-03-01 18:07 ` [PATCH 6.2 03/16] bpf: bpf_fib_lookup should not return neigh in NUD_FAILED state Greg Kroah-Hartman
2023-03-01 18:07 ` [PATCH 6.2 04/16] vc_screen: dont clobber return value in vcs_read Greg Kroah-Hartman
2023-03-01 18:07 ` [PATCH 6.2 05/16] drm/amd/display: Move DCN314 DOMAIN power control to DMCUB Greg Kroah-Hartman
2023-03-01 18:07 ` [PATCH 6.2 06/16] drm/amd/display: Properly reuse completion structure Greg Kroah-Hartman
2023-03-01 18:07 ` [PATCH 6.2 07/16] scripts/tags.sh: fix incompatibility with PCRE2 Greg Kroah-Hartman
2023-03-01 18:07 ` [PATCH 6.2 08/16] wifi: rtw88: usb: Set qsel correctly Greg Kroah-Hartman
2023-03-01 18:07 ` [PATCH 6.2 09/16] wifi: rtw88: usb: send Zero length packets if necessary Greg Kroah-Hartman
2023-03-01 18:07 ` Greg Kroah-Hartman [this message]
2023-03-01 18:07 ` [PATCH 6.2 11/16] usb: dwc3: pci: add support for the Intel Meteor Lake-M Greg Kroah-Hartman
2023-03-01 18:07 ` [PATCH 6.2 12/16] USB: serial: option: add support for VW/Skoda "Carstick LTE" Greg Kroah-Hartman
2023-03-01 18:07 ` [PATCH 6.2 13/16] usb: gadget: u_serial: Add null pointer check in gserial_resume Greg Kroah-Hartman
2023-03-01 18:07 ` [PATCH 6.2 14/16] arm64: dts: uniphier: Fix property name in PXs3 USB node Greg Kroah-Hartman
2023-03-01 18:07 ` [PATCH 6.2 15/16] usb: typec: pd: Remove usb_suspend_supported sysfs from sink PDO Greg Kroah-Hartman
2023-03-01 18:07 ` [PATCH 6.2 16/16] USB: core: Dont hold device lock while reading the "descriptors" sysfs file Greg Kroah-Hartman
2023-03-01 22:50 ` [PATCH 6.2 00/16] 6.2.2-rc1 review Florian Fainelli
2023-03-01 23:24 ` Justin Forbes
2023-03-02 1:42 ` Shuah Khan
2023-03-02 2:16 ` Bagas Sanjaya
2023-03-02 7:27 ` Jon Hunter
2023-03-02 10:21 ` Conor Dooley
2023-03-02 11:40 ` Sudip Mukherjee (Codethink)
2023-03-02 17:23 ` Ron Economos
2023-03-02 19:25 ` Naresh Kamboju
2023-03-02 23:16 ` Slade Watkins
2023-03-03 1:31 ` Guenter Roeck
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=20230301180653.670493262@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=kvalo@kernel.org \
--cc=patches@lists.linux.dev \
--cc=pkshih@realtek.com \
--cc=s.hauer@pengutronix.de \
--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