Commit 344c9719 authored Mar 07, 2019 by Nathan Chancellor Committed by Johannes Berg Mar 29, 2019

cfg80211: Change an 'else if' into an 'else' in cfg80211_calculate_bitrate_he

When building with -Wsometimes-uninitialized, Clang warns:

net/wireless/util.c:1223:11: warning: variable 'result' is used
uninitialized whenever 'if' condition is false
[-Wsometimes-uninitialized]

Clang can't evaluate at this point that WARN(1, ...) always returns true
because __ret_warn_on is defined as !!(condition), which isn't
immediately evaluated as 1. Change this branch to else so that it's
clear to Clang that we intend to bail out here.

Link: https://github.com/ClangBuiltLinux/linux/issues/382


Suggested-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent eb9b64e3

net/wireless/util.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1220,9 +1220,11 @@ static u32 cfg80211_calculate_bitrate_he(struct rate_info *rate)
		else if (rate->bw == RATE_INFO_BW_HE_RU &&
		rate->he_ru_alloc == NL80211_RATE_INFO_HE_RU_ALLOC_26)
		result = rates_26[rate->he_gi];
		else if (WARN(1, "invalid HE MCS: bw:%d, ru:%d\n",
		rate->bw, rate->he_ru_alloc))
		else {
		WARN(1, "invalid HE MCS: bw:%d, ru:%d\n",
		rate->bw, rate->he_ru_alloc);
		return 0;
		}

		/* now scale to the appropriate MCS */
		tmp = result;