From 49ae4cbad4df8748b6b62b5e9071948d7d9376da Mon Sep 17 00:00:00 2001 From: wadesong Date: Mon, 22 Jan 2018 15:03:12 +0800 Subject: [PATCH] qcacmn: Fix coding errors detected by gcc 5+ With gcc 5+ utilized for driver building, more coding errors are detected, some of which are valid issues. Fix all those errors in one shot. Change-Id: I263c70d4bff9ec0c3076103001cd7f2ccc8e0d1a CRs-Fixed: 2176076 --- umac/scan/dispatcher/src/wlan_scan_utils_api.c | 4 ++-- wmi/src/wmi_unified_tlv.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/umac/scan/dispatcher/src/wlan_scan_utils_api.c b/umac/scan/dispatcher/src/wlan_scan_utils_api.c index a380bb6b50af..237c42c9807f 100644 --- a/umac/scan/dispatcher/src/wlan_scan_utils_api.c +++ b/umac/scan/dispatcher/src/wlan_scan_utils_api.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -114,7 +114,7 @@ bool util_is_scan_entry_match( { if (entry1->cap_info.wlan_caps.ess != - entry1->cap_info.wlan_caps.ess) + entry2->cap_info.wlan_caps.ess) return false; if (entry1->cap_info.wlan_caps.ess && diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index b62fa55f0f75..6aae665d0c79 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -2504,7 +2504,7 @@ static QDF_STATUS send_scan_start_cmd_tlv(wmi_unified_t wmi_handle, if (params->extraie.len) extraie_len_with_pad = roundup(params->extraie.len, sizeof(uint32_t)); - len += extraie_len_with_pad; + len += extraie_len_with_pad; len += WMI_TLV_HDR_SIZE; /* Length of TLV for array of wmi_vendor_oui */ if (ie_whitelist->num_vendor_oui)