| Message ID | 20210814234248.1755703-1-nathan@kernel.org (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | iwlwifi: mvm: Fix bitwise vs logical operator in iwl_mvm_scan_fits() | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Sat, Aug 14, 2021 at 4:43 PM Nathan Chancellor <nathan@kernel.org> 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 <nathan@kernel.org> Thanks for the patch! Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> > --- > 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 >
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] <=
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 <nathan@kernel.org> --- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: ba31f97d43be41ca99ab72a6131d7c226306865f