diff mbox series

rsi: Remove unnecessary boolean condition

Message ID 20180921094828.16976-1-natechancellor@gmail.com
State Awaiting Upstream, archived
Delegated to: David Miller
Headers show
Series rsi: Remove unnecessary boolean condition | expand

Commit Message

Nathan Chancellor Sept. 21, 2018, 9:48 a.m. UTC
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>
---
 drivers/net/wireless/rsi/rsi_91x_mac80211.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Kalle Valo Oct. 1, 2018, 3:32 p.m. UTC | #1
Nathan Chancellor <natechancellor@gmail.com> wrote:

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

Patch applied to wireless-drivers-next.git, thanks.

f613e4803dd6 rsi: Remove unnecessary boolean condition
diff mbox series

Patch

diff --git a/drivers/net/wireless/rsi/rsi_91x_mac80211.c b/drivers/net/wireless/rsi/rsi_91x_mac80211.c
index 4e510cbe0a89..e56fc83faf0e 100644
--- a/drivers/net/wireless/rsi/rsi_91x_mac80211.c
+++ b/drivers/net/wireless/rsi/rsi_91x_mac80211.c
@@ -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))