2014-08-12 19:39:35

by Himangi Saraogi

Subject: [PATCH] rtlwifi: btcoexist: adjust double test

Rewrite a duplicated test to test the correct value

The Coccinelle semantic patch that finds this problem is:

// <smpl>
@@
expression E;
@@

(
* E
|| ... || E
|
* E
&& ... && E
)
// </smpl>

Signed-off-by: Himangi Saraogi <[email protected]>
---
In file drivers/staging/rtl8192ee/btcoexist/halbtcoutsrc.c, there is a
similar function that tests for WIRELESS_MODE_G and WIRELESS_MODE_B.
I have not tested the code, so you am not sure whether it is the
correct solution.

drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
index 33da3df..d4bd550 100644
--- a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
+++ b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
@@ -101,7 +101,7 @@ static bool halbtc_legacy(struct rtl_priv *adapter)

bool is_legacy = false;

- if ((mac->mode == WIRELESS_MODE_B) || (mac->mode == WIRELESS_MODE_B))
+ if ((mac->mode == WIRELESS_MODE_B) || (mac->mode == WIRELESS_MODE_G))
is_legacy = true;

return is_legacy;
--
1.9.1

2014-08-12 22:14:33

by Larry Finger

Subject: Re: [PATCH] rtlwifi: btcoexist: adjust double test

On 08/12/2014 02:39 PM, Himangi Saraogi wrote:
> Rewrite a duplicated test to test the correct value
>
> The Coccinelle semantic patch that finds this problem is:
>
> // <smpl>
> @@
> expression E;
> @@
>
> (
> * E
> || ... || E
> |
> * E
> && ... && E
> )
> // </smpl>
>
> Signed-off-by: Himangi Saraogi <[email protected]>
> ---
> In file drivers/staging/rtl8192ee/btcoexist/halbtcoutsrc.c, there is a
> similar function that tests for WIRELESS_MODE_G and WIRELESS_MODE_B.
> I have not tested the code, so you am not sure whether it is the
> correct solution.
>
> drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
> index 33da3df..d4bd550 100644
> --- a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
> +++ b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
> @@ -101,7 +101,7 @@ static bool halbtc_legacy(struct rtl_priv *adapter)
>
> bool is_legacy = false;
>
> - if ((mac->mode == WIRELESS_MODE_B) || (mac->mode == WIRELESS_MODE_B))
> + if ((mac->mode == WIRELESS_MODE_B) || (mac->mode == WIRELESS_MODE_G))
> is_legacy = true;
>
> return is_legacy;

The latest version of the vendor driver has this change already applied.

Acked-by: Larry.Finger <[email protected]>

Larry