Skip to content

Commit a892f6f

Browse files
Bitterblue SmithPing-Ke Shih
authored andcommitted
wifi: rtw88: usb: Simplify rtw_usb_write_data
The skb created in this function always has the same headroom, the chip's TX descriptor size. (pkt_info->offset is set by rtw_usb_write_data_rsvd_page() to chip->tx_pkt_desc_sz.) Use chip->tx_pkt_desc_sz directly. Signed-off-by: Bitterblue Smith <[email protected]> Tested-by: Larry Finger <[email protected]> Signed-off-by: Ping-Ke Shih <[email protected]> Link: https://msgid.link/[email protected]
1 parent d0bcb10 commit a892f6f

File tree

1 file changed

+5
-7
lines changed
  • drivers/net/wireless/realtek/rtw88

1 file changed

+5
-7
lines changed

drivers/net/wireless/realtek/rtw88/usb.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -433,23 +433,21 @@ static int rtw_usb_write_data(struct rtw_dev *rtwdev,
433433
{
434434
const struct rtw_chip_info *chip = rtwdev->chip;
435435
struct sk_buff *skb;
436-
unsigned int desclen, headsize, size;
436+
unsigned int size;
437437
u8 qsel;
438438
int ret = 0;
439439

440440
size = pkt_info->tx_pkt_size;
441441
qsel = pkt_info->qsel;
442-
desclen = chip->tx_pkt_desc_sz;
443-
headsize = pkt_info->offset ? pkt_info->offset : desclen;
444442

445-
skb = dev_alloc_skb(headsize + size);
443+
skb = dev_alloc_skb(chip->tx_pkt_desc_sz + size);
446444
if (unlikely(!skb))
447445
return -ENOMEM;
448446

449-
skb_reserve(skb, headsize);
447+
skb_reserve(skb, chip->tx_pkt_desc_sz);
450448
skb_put_data(skb, buf, size);
451-
skb_push(skb, headsize);
452-
memset(skb->data, 0, headsize);
449+
skb_push(skb, chip->tx_pkt_desc_sz);
450+
memset(skb->data, 0, chip->tx_pkt_desc_sz);
453451
rtw_tx_fill_tx_desc(pkt_info, skb);
454452
rtw_tx_fill_txdesc_checksum(rtwdev, pkt_info, skb->data);
455453

0 commit comments

Comments
 (0)