You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
87 lines
2.8 KiB
87 lines
2.8 KiB
1 year ago
|
From 9342b906de5adf5a9a5821d84654bfd3e857139e Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?=C3=8D=C3=B1igo=20Huguet?= <ihuguet@redhat.com>
|
||
|
|
Date: Wed, 24 May 2023 15:00:39 +0200
|
||
|
|
Subject: [PATCH 130/142] wifi: rtw89: fix potential wrong mapping for
|
||
|
|
pkt-offload
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Bugzilla: https://bugzilla.redhat.com/2207499
|
||
|
|
|
||
|
|
commit b8e8ff842b1bfe7602409fc71ee812db871ccce6
|
||
|
|
Author: Chin-Yen Lee <timlee@realtek.com>
|
||
|
|
Date: Mon Jan 23 14:53:56 2023 +0800
|
||
|
|
|
||
|
|
wifi: rtw89: fix potential wrong mapping for pkt-offload
|
||
|
|
|
||
|
|
When driver fails to send H2C to firmware for pkt-offload, we should not
|
||
|
|
update the pkt_list of driver, and need to release allocated pkt index to
|
||
|
|
avoid wrong mapping between driver and firmware.
|
||
|
|
|
||
|
|
Signed-off-by: Chin-Yen Lee <timlee@realtek.com>
|
||
|
|
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
|
||
|
|
Signed-off-by: Kalle Valo <kvalo@kernel.org>
|
||
|
|
Link: https://lore.kernel.org/r/20230123065401.14174-2-pkshih@realtek.com
|
||
|
|
|
||
|
|
Signed-off-by: Íñigo Huguet <ihuguet@redhat.com>
|
||
|
|
---
|
||
|
|
drivers/net/wireless/realtek/rtw89/fw.c | 9 ++++++---
|
||
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
|
||
|
|
index 85c7172e931bf..210785149801b 100644
|
||
|
|
--- a/drivers/net/wireless/realtek/rtw89/fw.c
|
||
|
|
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
|
||
|
|
@@ -948,13 +948,13 @@ static int rtw89_fw_h2c_add_wow_fw_ofld(struct rtw89_dev *rtwdev,
|
||
|
|
if (!skb)
|
||
|
|
goto err;
|
||
|
|
|
||
|
|
- list_add_tail(&info->list, &rtw_wow->pkt_list);
|
||
|
|
ret = rtw89_fw_h2c_add_pkt_offload(rtwdev, &info->id, skb);
|
||
|
|
kfree_skb(skb);
|
||
|
|
|
||
|
|
if (ret)
|
||
|
|
- return ret;
|
||
|
|
+ goto err;
|
||
|
|
|
||
|
|
+ list_add_tail(&info->list, &rtw_wow->pkt_list);
|
||
|
|
*id = info->id;
|
||
|
|
return 0;
|
||
|
|
|
||
|
|
@@ -2133,6 +2133,7 @@ int rtw89_fw_h2c_add_pkt_offload(struct rtw89_dev *rtwdev, u8 *id,
|
||
|
|
skb = rtw89_fw_h2c_alloc_skb_with_hdr(rtwdev, H2C_LEN_PKT_OFLD + skb_ofld->len);
|
||
|
|
if (!skb) {
|
||
|
|
rtw89_err(rtwdev, "failed to alloc skb for h2c pkt offload\n");
|
||
|
|
+ rtw89_core_release_bit_map(rtwdev->pkt_offload, alloc_id);
|
||
|
|
return -ENOMEM;
|
||
|
|
}
|
||
|
|
skb_put(skb, H2C_LEN_PKT_OFLD);
|
||
|
|
@@ -2151,6 +2152,7 @@ int rtw89_fw_h2c_add_pkt_offload(struct rtw89_dev *rtwdev, u8 *id,
|
||
|
|
ret = rtw89_h2c_tx(rtwdev, skb, false);
|
||
|
|
if (ret) {
|
||
|
|
rtw89_err(rtwdev, "failed to send h2c\n");
|
||
|
|
+ rtw89_core_release_bit_map(rtwdev->pkt_offload, alloc_id);
|
||
|
|
goto fail;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -2684,13 +2686,14 @@ static int rtw89_append_probe_req_ie(struct rtw89_dev *rtwdev,
|
||
|
|
goto out;
|
||
|
|
}
|
||
|
|
|
||
|
|
- list_add_tail(&info->list, &scan_info->pkt_list[band]);
|
||
|
|
ret = rtw89_fw_h2c_add_pkt_offload(rtwdev, &info->id, new);
|
||
|
|
if (ret) {
|
||
|
|
kfree_skb(new);
|
||
|
|
+ kfree(info);
|
||
|
|
goto out;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ list_add_tail(&info->list, &scan_info->pkt_list[band]);
|
||
|
|
kfree_skb(new);
|
||
|
|
}
|
||
|
|
out:
|
||
|
|
--
|
||
|
|
2.13.6
|
||
|
|
|