Merge 4.4.187 into android-4.4

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / net / mac80211 / rate.c

diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index a4e2f4e..24033c8 100644 (file)
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -173,9 +173,11 @@ 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);
 
-       /* try built-in one if specific alg requested but not found */
-       if (!ops && strlen(CONFIG_MAC80211_RC_DEFAULT))
+       /* Note: check for > 0 is intentional to avoid clang warning */
+       if (!ops && (strlen(CONFIG_MAC80211_RC_DEFAULT) > 0))
+               /* try built-in one if specific alg requested but not found */
                ops = ieee80211_try_rate_control_ops_get(CONFIG_MAC80211_RC_DEFAULT);
+
        kernel_param_unlock(THIS_MODULE);
 
        return ops;