iwlwifi: mvm: Change an 'else if' into an 'else' in iwl_mvm_send_add_bcast_sta

When building with -Wsometimes-uninitialized, Clang warns:

drivers/net/wireless/intel/iwlwifi/mvm/sta.c:2114:12: warning: variable
'queue' is used uninitialized whenever 'if' condition is false
[-Wsometimes-uninitialized]

Clang can't evaluate at this point that WARN(1, ...) always returns true
because __ret_warn_on is defined as !!(condition), which isn't
immediately evaluated as 1. Change this branch to else so that it's
clear to Clang that we intend to bail out here.

Link: https://github.com/ClangBuiltLinux/linux/issues/399
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
[added a few more braces]
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
index 6c0e805eb81e85b16282162413f413f8b4c44bce..f545a737a92dfa8321b83ce00748c1833ec7c854 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
@@ -2110,12 +2110,14 @@ int iwl_mvm_send_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
 
        if (!iwl_mvm_has_new_tx_api(mvm)) {
                if (vif->type == NL80211_IFTYPE_AP ||
-                   vif->type == NL80211_IFTYPE_ADHOC)
+                   vif->type == NL80211_IFTYPE_ADHOC) {
                        queue = mvm->probe_queue;
-               else if (vif->type == NL80211_IFTYPE_P2P_DEVICE)
+               } else if (vif->type == NL80211_IFTYPE_P2P_DEVICE) {
                        queue = mvm->p2p_dev_queue;
-               else if (WARN(1, "Missing required TXQ for adding bcast STA\n"))
+               } else {
+                       WARN(1, "Missing required TXQ for adding bcast STA\n");
                        return -EINVAL;
+               }
 
                bsta->tfd_queue_msk |= BIT(queue);