Skip to content

Commit 44371ae

Browse files
Matthias Kaehlckepundiramit
authored andcommitted
UPSTREAM: mac80211: Fix clang warning about constant operand in logical operation
When clang detects a non-boolean constant in a logical operation it generates a 'constant-logical-operand' warning. In ieee80211_try_rate_control_ops_get() the result of strlen(<const str>) is used in a logical operation, clang resolves the expression to an (integer) constant at compile time when clang's builtin strlen function is used. Change the condition to check for strlen() > 0 to make the constant operand boolean and thus avoid the warning. Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Signed-off-by: Johannes Berg <johannes.berg@intel.com> (cherry picked from commit 93f56de259376d7e4fff2b2d104082e1fa66e237) Bug: 78886293 Change-Id: Ia819eb188699c1d81047c0dfa143da52c6cb490c Signed-off-by: Alistair Strachan <astrachan@google.com>
1 parent d1a54f6 commit 44371ae

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

net/mac80211/rate.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,11 @@ ieee80211_rate_control_ops_get(const char *name)
173173
/* try default if specific alg requested but not found */
174174
ops = ieee80211_try_rate_control_ops_get(ieee80211_default_rc_algo);
175175

176-
/* try built-in one if specific alg requested but not found */
177-
if (!ops && strlen(CONFIG_MAC80211_RC_DEFAULT))
176+
/* Note: check for > 0 is intentional to avoid clang warning */
177+
if (!ops && (strlen(CONFIG_MAC80211_RC_DEFAULT) > 0))
178+
/* try built-in one if specific alg requested but not found */
178179
ops = ieee80211_try_rate_control_ops_get(CONFIG_MAC80211_RC_DEFAULT);
180+
179181
kernel_param_unlock(THIS_MODULE);
180182

181183
return ops;

0 commit comments

Comments
 (0)