2022-12-06 11:07:38

by Peter Kosyh

Subject: [PATCH] rtlwifi: btcoexist: fix conditions branches that are never executed

Commit 40ca18823515 ("rtlwifi: btcoex: 23b 1ant: fine tune for wifi not
connected") introduced never executed branches.

Compile test only.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Signed-off-by: Peter Kosyh <[email protected]>
---
I'm not sure that patch do right thing! But these two places are really
never executed and should be fixed. I hope that Ping-Ka could check this.

.../net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
index 70492929d7e4..039bbedb41c2 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
@@ -1903,7 +1903,7 @@ btc8723b1ant_action_wifi_not_conn_scan(struct btc_coexist *btcoexist)
true, 32);
halbtc8723b1ant_coex_table_with_type(btcoexist,
NORMAL_EXEC, 4);
- } else if (bt_link_info->a2dp_exist) {
+ } else if (bt_link_info->pan_exist) {
halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,
true, 22);
halbtc8723b1ant_coex_table_with_type(btcoexist,
@@ -1964,8 +1964,7 @@ static void btc8723b1ant_action_wifi_conn_scan(struct btc_coexist *btcoexist)
true, 32);
halbtc8723b1ant_coex_table_with_type(btcoexist,
NORMAL_EXEC, 4);
- } else if (bt_link_info->a2dp_exist &&
- bt_link_info->pan_exist) {
+ } else if (bt_link_info->pan_exist) {
halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,
true, 22);
halbtc8723b1ant_coex_table_with_type(btcoexist,
--
2.38.1

2022-12-07 01:07:45

by Ping-Ke Shih

Subject: RE: [PATCH] rtlwifi: btcoexist: fix conditions branches that are never executed

> -----Original Message-----
> From: Peter Kosyh <[email protected]>
> Sent: Tuesday, December 6, 2022 6:49 PM
> To: Ping-Ke Shih <[email protected]>
> Cc: Peter Kosyh <[email protected]>; Kalle Valo <[email protected]>; David S. Miller <[email protected]>;
> Eric Dumazet <[email protected]>; Jakub Kicinski <[email protected]>; [email protected];
> [email protected]; [email protected]; [email protected]
> Subject: [PATCH] rtlwifi: btcoexist: fix conditions branches that are never executed
>
> Commit 40ca18823515 ("rtlwifi: btcoex: 23b 1ant: fine tune for wifi not
> connected") introduced never executed branches.
>
> Compile test only.
>
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
>
> Signed-off-by: Peter Kosyh <[email protected]>

I compare with vendor driver and confirm these changes are correct.
Thank you.

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


> ---
> I'm not sure that patch do right thing! But these two places are really
> never executed and should be fixed. I hope that Ping-Ka could check this.
>
> .../net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
> b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
> index 70492929d7e4..039bbedb41c2 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
> +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
> @@ -1903,7 +1903,7 @@ btc8723b1ant_action_wifi_not_conn_scan(struct btc_coexist *btcoexist)
> true, 32);
> halbtc8723b1ant_coex_table_with_type(btcoexist,
> NORMAL_EXEC, 4);
> - } else if (bt_link_info->a2dp_exist) {
> + } else if (bt_link_info->pan_exist) {
> halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,
> true, 22);
> halbtc8723b1ant_coex_table_with_type(btcoexist,
> @@ -1964,8 +1964,7 @@ static void btc8723b1ant_action_wifi_conn_scan(struct btc_coexist *btcoexist)
> true, 32);
> halbtc8723b1ant_coex_table_with_type(btcoexist,
> NORMAL_EXEC, 4);
> - } else if (bt_link_info->a2dp_exist &&
> - bt_link_info->pan_exist) {
> + } else if (bt_link_info->pan_exist) {
> halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,
> true, 22);
> halbtc8723b1ant_coex_table_with_type(btcoexist,
> --
> 2.38.1

2022-12-08 14:53:48

by Kalle Valo

Subject: Re: wifi: rtlwifi: btcoexist: fix conditions branches that are never executed

Peter Kosyh <[email protected]> wrote:

> Commit 40ca18823515 ("rtlwifi: btcoex: 23b 1ant: fine tune for wifi not
> connected") introduced never executed branches.
>
> Compile test only.
>
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
>
> Signed-off-by: Peter Kosyh <[email protected]>
> Acked-by: Ping-Ke Shih <[email protected]>

Patch applied to wireless-next.git, thanks.

e48c45318d3d wifi: rtlwifi: btcoexist: fix conditions branches that are never executed

--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches