]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
rsi: Remove unnecessary boolean condition
authorNathan Chancellor <natechancellor@gmail.com>
Fri, 21 Sep 2018 09:48:29 +0000 (02:48 -0700)
committerKalle Valo <kvalo@codeaurora.org>
Mon, 1 Oct 2018 15:31:10 +0000 (18:31 +0300)
Clang warns that the address of a pointer will always evaluated as true
in a boolean context.

drivers/net/wireless/rsi/rsi_91x_mac80211.c:927:50: warning: address of
array 'key->key' will always evaluate to 'true'
[-Wpointer-bool-conversion]
        if (vif->type == NL80211_IFTYPE_STATION && key->key &&
                                                ~~ ~~~~~^~~
1 warning generated.

Link: https://github.com/ClangBuiltLinux/linux/issues/136
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/rsi/rsi_91x_mac80211.c

index 4e510cbe0a89f011d6f5af6db22846146702c1e8..e56fc83faf0ef8d76b75719cde4547fd1cbcdf17 100644 (file)
@@ -924,7 +924,7 @@ static int rsi_hal_key_config(struct ieee80211_hw *hw,
        if (status)
                return status;
 
-       if (vif->type == NL80211_IFTYPE_STATION && key->key &&
+       if (vif->type == NL80211_IFTYPE_STATION &&
            (key->cipher == WLAN_CIPHER_SUITE_WEP104 ||
             key->cipher == WLAN_CIPHER_SUITE_WEP40)) {
                if (!rsi_send_block_unblock_frame(adapter->priv, false))