Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1618272

[PATCH] mac80211: Fix clang warning about constant operand in logical operation

Path csiph.com!news.mixmin.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod
From Matthias Kaehlcke <mka@chromium.org>
Newsgroups linux.kernel
Subject [PATCH] mac80211: Fix clang warning about constant operand in logical operation
Date Thu, 06 Apr 2017 21:00:02 +0200
Message-ID <ttkNs-4Ff-21@gated-at.bofh.it> (permalink)
X-Original-To Johannes Berg <johannes@sipsolutions.net>, "David S . Miller" <davem@davemloft.net>
X-Google-Dkim-Signature v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=lR9/u9qGKR2PsCBu5HH2cDTCS8Gbz+237nosURhO104=; b=ocfr2li3dEuOMhvSH4vFxuT8YFTnbk492klCMOXmAunf8NHbDSpK2uV2ON+CGoKdtI tgYNu156Aeeio7QY3GoLoab+wwPLsIS7K0D1B36kAakk2vjkM9vqhd8y7gyGsTCBb6cS eh/Fj8McdA0cnjItp6SUsnyTMQI04Nwca+DhsHuIwK2qk04/SaDmS8InU8c7bpqGc7Jd bNK0Q/glQmIsZDY5gRuaXq7Tz+8MnHY04E+KrDILb8argRAZWz/12jDc6F6lSZ6YsN8A F8/Zvxh7Mc+4+05nG3lLbM7ExgpK4VqDdg1EKkSFTpgva9q9a06xKTBJcCpZf5p2elP+ MDMQ==
X-Gm-Message-State AFeK/H3EgXEHEKXEBK1nz74/7WfQO9AaSe9nN8IP38OGw7sTzu/UvVXVBhecJGKHMAnv8nlZ
X-Received by 10.36.207.212 with SMTP id y203mr27242334itf.63.1491505016685; Thu, 06 Apr 2017 11:56:56 -0700 (PDT)
X-Mailer git-send-email 2.12.2.715.g7642488e1d-goog
Sender robomod@news.nic.it
List-ID <linux-kernel.vger.kernel.org>
X-Mailing-List linux-kernel@vger.kernel.org
Approved robomod@news.nic.it
Lines 35
Organization linux.* mail to news gateway
X-Original-Cc linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, Grant Grundler <grundler@chromium.org>, Michael Davidson <md@google.com>, Greg Hackmann <ghackmann@google.com>, Matthias Kaehlcke <mka@chromium.org>
X-Original-Date Thu, 6 Apr 2017 11:56:33 -0700
X-Original-Message-ID <20170406185633.91065-1-mka@chromium.org>
X-Original-Sender linux-kernel-owner@vger.kernel.org
Xref csiph.com linux.kernel:1618272

Show key headers only | View raw


Clang raises a warning about the expression 'strlen(CONFIG_XXX)' being
used in a logical operation. Clangs' builtin strlen function resolves the
expression to a constant at compile time, which causes clang to generate
a 'constant-logical-operand' warning.

Split the if statement in two to avoid using the const expression in a
logical operation.

Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
---
 net/mac80211/rate.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index 206698bc93f4..68ff202d6380 100644
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -173,9 +173,14 @@ ieee80211_rate_control_ops_get(const char *name)
 		/* try default if specific alg requested but not found */
 		ops = ieee80211_try_rate_control_ops_get(ieee80211_default_rc_algo);
 
+	if (ops)
+		goto unlock;
+
 	/* try built-in one if specific alg requested but not found */
-	if (!ops && strlen(CONFIG_MAC80211_RC_DEFAULT))
+	if (strlen(CONFIG_MAC80211_RC_DEFAULT))
 		ops = ieee80211_try_rate_control_ops_get(CONFIG_MAC80211_RC_DEFAULT);
+
+unlock:
 	kernel_param_unlock(THIS_MODULE);
 
 	return ops;
-- 
2.12.2.715.g7642488e1d-goog

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread


Thread

[PATCH] mac80211: Fix clang warning about constant operand in logical operation Matthias Kaehlcke <mka@chromium.org> - 2017-04-06 21:00 +0200
  Re: [PATCH] mac80211: Fix clang warning about constant operand in  logical operation Johannes Berg <johannes@sipsolutions.net> - 2017-04-06 21:20 +0200
    Re: [PATCH] mac80211: Fix clang warning about constant operand in  logical operation Matthias Kaehlcke <mka@chromium.org> - 2017-04-06 21:30 +0200
      Re: [PATCH] mac80211: Fix clang warning about constant operand in  logical operation Johannes Berg <johannes@sipsolutions.net> - 2017-04-06 23:20 +0200
        Re: [PATCH] mac80211: Fix clang warning about constant operand in  logical operation Matthias Kaehlcke <mka@chromium.org> - 2017-04-07 00:50 +0200
          Re: [PATCH] mac80211: Fix clang warning about constant operand in  logical operation Johannes Berg <johannes@sipsolutions.net> - 2017-04-07 01:00 +0200
            Re: [PATCH] mac80211: Fix clang warning about constant operand in  logical operation Matthias Kaehlcke <mka@chromium.org> - 2017-04-07 01:10 +0200
  RE: [PATCH] mac80211: Fix clang warning about constant operand in  logical operation David Laight <David.Laight@ACULAB.COM> - 2017-04-10 16:20 +0200

csiph-web