wifi: rtw89: refine H2C command that pause transmitting by MAC ID

To reuse this function to support extended H2C command that is used by
newer chip, change to use a pointer to fill pause ID and mask.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20240108091307.67296-1-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index 61ae8e584a3bd570307a90b10decfaaf1d18fedc..991c42c4e5091491c841781f35ceec431d05fc88 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -2489,20 +2489,23 @@ fail:
 int rtw89_fw_h2c_macid_pause(struct rtw89_dev *rtwdev, u8 sh, u8 grp,
                             bool pause)
 {
-       struct rtw89_fw_macid_pause_grp h2c = {{0}};
-       u8 len = sizeof(struct rtw89_fw_macid_pause_grp);
+       struct rtw89_fw_macid_pause_grp *h2c;
+       __le32 set = cpu_to_le32(BIT(sh));
+       u8 len = sizeof(*h2c);
        struct sk_buff *skb;
        int ret;
 
-       skb = rtw89_fw_h2c_alloc_skb_with_hdr(rtwdev, H2C_JOIN_INFO_LEN);
+       skb = rtw89_fw_h2c_alloc_skb_with_hdr(rtwdev, len);
        if (!skb) {
-               rtw89_err(rtwdev, "failed to alloc skb for h2c join\n");
+               rtw89_err(rtwdev, "failed to alloc skb for h2c macid pause\n");
                return -ENOMEM;
        }
-       h2c.mask_grp[grp] = cpu_to_le32(BIT(sh));
+       skb_put(skb, len);
+       h2c = (struct rtw89_fw_macid_pause_grp *)skb->data;
+
+       h2c->mask_grp[grp] = set;
        if (pause)
-               h2c.pause_grp[grp] = cpu_to_le32(BIT(sh));
-       skb_put_data(skb, &h2c, len);
+               h2c->pause_grp[grp] = set;
 
        rtw89_h2c_pkt_set_hdr(rtwdev, skb, FWCMD_TYPE_H2C,
                              H2C_CAT_MAC, H2C_CL_MAC_FW_OFLD,