Merge tag 'mac80211-next-for-davem-2019-04-26' of git://git.kernel.org/pub/scm/linux...

[linux.git] / net / wireless / util.c

diff --git a/net/wireless/util.c b/net/wireless/util.c
index 6c02c9cf7aa9e6909ab94ecc03d4596796b60bb0..cf63b635afc098eeafe7462bd41b86a7e433b85c 100644 (file)
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -1229,9 +1229,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;