Skip to contentSkip to conversation

iwlwifi: mvm: Fix bitwise vs logical operator in iwl_mvm_scan_fits()

PATCH In review Nathan Chancellor 2 participants 2 messages Aug 14, 2021 – Aug 16, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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")
---
 drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/scan.c +1 -1
index 0368b7101222..494379fc9224 100644
@@ -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

Signature · 1 line
2.33.0.rc2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Nathan Chancellor

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) &
                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                                                    &&
Quoted 7 lines

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")

Thanks for the patch!

Quoted 22 lines
---
 drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/scan.c +1 -1
index 0368b7101222..494379fc9224 100644
@@ -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

Signature · 2 lines
Thanks,
~Nick Desaulniers