2021-08-14 23:45:33

by Nathan Chancellor

Subject: [PATCH] iwlwifi: mvm: Fix bitwise vs logical operator in iwl_mvm_scan_fits()

Clang warns:

drivers/net/wireless/intel/iwlwifi/mvm/scan.c:835:3: warning: bitwise
and of boolean expressions; did you mean logical and?
[-Wbool-operation-and]
(n_channels <= mvm->fw->ucode_capa.n_scan_channels) &
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
&&
1 warning generated.

Replace the bitwise AND with a logical one to solve the warning, which
is clearly what was intended.

Fixes: 999d2568ee0c ("iwlwifi: mvm: combine scan size checks into a common function")
Signed-off-by: Nathan Chancellor <[email protected]>
---
drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index 0368b7101222..494379fc9224 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -832,7 +832,7 @@ static inline bool iwl_mvm_scan_fits(struct iwl_mvm *mvm, int n_ssids,
int n_channels)
{
return ((n_ssids <= PROBE_OPTION_MAX) &&
- (n_channels <= mvm->fw->ucode_capa.n_scan_channels) &
+ (n_channels <= mvm->fw->ucode_capa.n_scan_channels) &&
(ies->common_ie_len +
ies->len[NL80211_BAND_2GHZ] +
ies->len[NL80211_BAND_5GHZ] <=

base-commit: ba31f97d43be41ca99ab72a6131d7c226306865f
--
2.33.0.rc2

2021-08-16 18:46:16

by Nick Desaulniers

Subject: Re: [PATCH] iwlwifi: mvm: Fix bitwise vs logical operator in iwl_mvm_scan_fits()

On Sat, Aug 14, 2021 at 4:43 PM Nathan Chancellor <[email protected]> wrote:
>
> Clang warns:
>
> drivers/net/wireless/intel/iwlwifi/mvm/scan.c:835:3: warning: bitwise
> and of boolean expressions; did you mean logical and?
> [-Wbool-operation-and]
> (n_channels <= mvm->fw->ucode_capa.n_scan_channels) &
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> &&
> 1 warning generated.
>
> Replace the bitwise AND with a logical one to solve the warning, which
> is clearly what was intended.
>
> Fixes: 999d2568ee0c ("iwlwifi: mvm: combine scan size checks into a common function")
> Signed-off-by: Nathan Chancellor <[email protected]>

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

> ---
> drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
> index 0368b7101222..494379fc9224 100644
> --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
> +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
> @@ -832,7 +832,7 @@ static inline bool iwl_mvm_scan_fits(struct iwl_mvm *mvm, int n_ssids,
> int n_channels)
> {
> return ((n_ssids <= PROBE_OPTION_MAX) &&
> - (n_channels <= mvm->fw->ucode_capa.n_scan_channels) &
> + (n_channels <= mvm->fw->ucode_capa.n_scan_channels) &&
> (ies->common_ie_len +
> ies->len[NL80211_BAND_2GHZ] +
> ies->len[NL80211_BAND_5GHZ] <=
>
> base-commit: ba31f97d43be41ca99ab72a6131d7c226306865f
> --
> 2.33.0.rc2
>


--
Thanks,
~Nick Desaulniers