Skip to contentSkip to conversation

iwlwifi: work around clang -Wuninitialized warning

PATCH In review Arnd Bergmann 2 participants 3 messages Mar 22, 2019 – Mar 23, 2019

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

PATCH 1/1 iwlwifi: work around clang -Wuninitialized warning

Clang incorrectly warns about an uninitialized variable:

drivers/net/wireless/intel/iwlwifi/mvm/sta.c:2114:12: error: variable 'queue' is used uninitialized whenever 'if'
condition is false [-Werror,-Wsometimes-uninitialized]
else if (WARN(1, "Missing required TXQ for adding bcast STA\n"))
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/asm-generic/bug.h:130:36: note: expanded from macro 'WARN'

 #define WARN(condition, format...) ({                                   \
                                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/net/wireless/intel/iwlwifi/mvm/sta.c:2119:33: note: uninitialized use occurs here
                iwl_mvm_enable_txq(mvm, NULL, queue, 0, &cfg, wdg_timeout);
                                              ^~~~~

drivers/net/wireless/intel/iwlwifi/mvm/sta.c:2114:8: note: remove the 'if' if its condition is always true
else if (WARN(1, "Missing required TXQ for adding bcast STA\n"))
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/net/wireless/intel/iwlwifi/mvm/sta.c:2094:11: note: initialize the variable 'queue' to silence this warning

        int queue;
                 ^
                  = 0

1 error generated.

This cannot happen because the if/else if/else if block always has one code path that is entered. However, we can simply rearrange the code to let clang see this as well.

---
 drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/sta.c +5 -3
index 498c315291cf..91ce56d2ebb8 100644
@@ -2107,12 +2107,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);
 
Signature · 1 line
2.20.0
#1 lore raw
Quoted 30 lines · Arnd Bergmann

Clang incorrectly warns about an uninitialized variable:

drivers/net/wireless/intel/iwlwifi/mvm/sta.c:2114:12: error: variable 'queue' is used uninitialized whenever 'if'
condition is false [-Werror,-Wsometimes-uninitialized]
else if (WARN(1, "Missing required TXQ for adding
bcast STA\n"))

                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~
include/asm-generic/bug.h:130:36: note: expanded from macro 'WARN'
 #define WARN(condition, format...)
({                                   \
                                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

~~~~
drivers/net/wireless/intel/iwlwifi/mvm/sta.c:2119:33: note:
uninitialized use occurs here
iwl_mvm_enable_txq(mvm, NULL, queue, 0, &cfg,

wdg_timeout);
                                              ^~~~~

drivers/net/wireless/intel/iwlwifi/mvm/sta.c:2114:8: note: remove the 'if' if its condition is always true
else if (WARN(1, "Missing required TXQ for adding
bcast STA\n"))

                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~
drivers/net/wireless/intel/iwlwifi/mvm/sta.c:2094:11: note:
initialize the variable 'queue' to silence this warning
        int queue;
                 ^
                  = 0
Quoted 8 lines

1 error generated.

This cannot happen because the if/else if/else if block always has one code path that is entered. However, we can simply rearrange the code to let clang see this as well.

---

Thanks for the patch, Arnd! But I have already queued up an equivalent patch for v5.2 (should probably reach linux-next by the end of next week or so):

https://patchwork.kernel.org/patch/10844025/

--
Cheers,
Luca.

#2 lore raw
Quoted 9 lines · Luca Coelho
Quoted 7 lines · Arnd Bergmann

Clang incorrectly warns about an uninitialized variable:

This cannot happen because the if/else if/else if block always has one code path that is entered. However, we can simply rearrange the code to let clang see this as well.

Quoted 8 lines
Quoted 2 lines

---

Thanks for the patch, Arnd! But I have already queued up an equivalent patch for v5.2 (should probably reach linux-next by the end of next week or so):

https://patchwork.kernel.org/patch/10844025/

Thanks, and sorry for the duplicate. I forgot to check for the patches that Nathan had already done when I started sending out my own series on the same issues.

Arnd