From 27cdaa15fb4dafb34119fb30d5e5b7fbb87a054b Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Wed, 30 May 2018 19:21:01 -0700 Subject: [PATCH] qcacld-3.0: Fix logging issue in NL80211_RATE_INFO_BITRATE32 Even though the bitrate is greater than zero, because of incorrect conditional check, error log "Invalid bitrate" is getting printed. Hence, fix this by adding proper conditional check. Change-Id: I2076c7a90e735e4a278f4d5894e51abc8bd091c0 CRs-Fixed: 2250687 --- core/hdd/src/wlan_hdd_cfg80211.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index f7ee6baeaa..25afe5cd84 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -4619,18 +4619,21 @@ static int32_t hdd_add_tx_bitrate(struct sk_buff *skb, /* report 16-bit bitrate only if we can */ bitrate_compat = bitrate < (1UL << 16) ? bitrate : 0; - if (bitrate > 0 && - nla_put_u32(skb, NL80211_RATE_INFO_BITRATE32, bitrate)) { - hdd_err("put fail bitrate: %u", bitrate); - goto fail; + if (bitrate > 0) { + if (nla_put_u32(skb, NL80211_RATE_INFO_BITRATE32, bitrate)) { + hdd_err("put fail bitrate: %u", bitrate); + goto fail; + } } else { hdd_err("Invalid bitrate: %u", bitrate); } - if (bitrate_compat > 0 && - nla_put_u16(skb, NL80211_RATE_INFO_BITRATE, bitrate_compat)) { - hdd_err("put fail"); - goto fail; + if (bitrate_compat > 0) { + if (nla_put_u16(skb, NL80211_RATE_INFO_BITRATE, + bitrate_compat)) { + hdd_err("put fail bitrate_compat: %u", bitrate_compat); + goto fail; + } } else { hdd_err("Invalid bitrate_compat: %u", bitrate_compat); }