2021-08-15 00:00:03

by Nathan Chancellor

Subject: [PATCH] staging: rtl8192u: Fix bitwise vs logical operator in TranslateRxSignalStuff819xUsb()

clang warns:

drivers/staging/rtl8192u/r8192U_core.c:4268:20: warning: bitwise and of
boolean expressions; did you mean logical and? [-Wbool-operation-and]
bpacket_toself = bpacket_match_bssid &
^~~~~~~~~~~~~~~~~~~~~
&&
1 warning generated.

Replace the bitwise AND with a logical one to clear up the warning, as
that is clearly what was intended.

Fixes: 8fc8598e61f6 ("Staging: Added Realtek rtl8192u driver to staging")
Signed-off-by: Nathan Chancellor <[email protected]>
---
drivers/staging/rtl8192u/r8192U_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index db26edeccea6..b6698656fc01 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -4265,7 +4265,7 @@ static void TranslateRxSignalStuff819xUsb(struct sk_buff *skb,
bpacket_match_bssid = (type != IEEE80211_FTYPE_CTL) &&
(ether_addr_equal(priv->ieee80211->current_network.bssid, (fc & IEEE80211_FCTL_TODS) ? hdr->addr1 : (fc & IEEE80211_FCTL_FROMDS) ? hdr->addr2 : hdr->addr3))
&& (!pstats->bHwError) && (!pstats->bCRC) && (!pstats->bICV);
- bpacket_toself = bpacket_match_bssid &
+ bpacket_toself = bpacket_match_bssid &&
(ether_addr_equal(praddr, priv->ieee80211->dev->dev_addr));

if (WLAN_FC_GET_FRAMETYPE(fc) == IEEE80211_STYPE_BEACON)

base-commit: 0bd35146642bdc56f1b87d75f047b1c92bd2bd39
--
2.33.0.rc2

2021-08-16 18:49:25

by Nick Desaulniers

Subject: Re: [PATCH] staging: rtl8192u: Fix bitwise vs logical operator in TranslateRxSignalStuff819xUsb()

On Sat, Aug 14, 2021 at 4:58 PM Nathan Chancellor <[email protected]> wrote:
>
> clang warns:
>
> drivers/staging/rtl8192u/r8192U_core.c:4268:20: warning: bitwise and of
> boolean expressions; did you mean logical and? [-Wbool-operation-and]
> bpacket_toself = bpacket_match_bssid &
> ^~~~~~~~~~~~~~~~~~~~~
> &&
> 1 warning generated.
>
> Replace the bitwise AND with a logical one to clear up the warning, as
> that is clearly what was intended.
>
> Fixes: 8fc8598e61f6 ("Staging: Added Realtek rtl8192u driver to staging")
> Signed-off-by: Nathan Chancellor <[email protected]>

Thanks for the patch!
Reviewed-by: Nick Desaulniers <[email protected]>

> ---
> drivers/staging/rtl8192u/r8192U_core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
> index db26edeccea6..b6698656fc01 100644
> --- a/drivers/staging/rtl8192u/r8192U_core.c
> +++ b/drivers/staging/rtl8192u/r8192U_core.c
> @@ -4265,7 +4265,7 @@ static void TranslateRxSignalStuff819xUsb(struct sk_buff *skb,
> bpacket_match_bssid = (type != IEEE80211_FTYPE_CTL) &&
> (ether_addr_equal(priv->ieee80211->current_network.bssid, (fc & IEEE80211_FCTL_TODS) ? hdr->addr1 : (fc & IEEE80211_FCTL_FROMDS) ? hdr->addr2 : hdr->addr3))
> && (!pstats->bHwError) && (!pstats->bCRC) && (!pstats->bICV);
> - bpacket_toself = bpacket_match_bssid &
> + bpacket_toself = bpacket_match_bssid &&
> (ether_addr_equal(praddr, priv->ieee80211->dev->dev_addr));
>
> if (WLAN_FC_GET_FRAMETYPE(fc) == IEEE80211_STYPE_BEACON)
>
> base-commit: 0bd35146642bdc56f1b87d75f047b1c92bd2bd39
> --
> 2.33.0.rc2
>


--
Thanks,
~Nick Desaulniers