qcacld-3.0: Move buckets_scanned mask for extscan get cache result
qcacld-2.0 to qcacld-3.0 propagation
If host issues extscan get cache results, while gscan is not in
progress then buckets_scanned mask comes as zero. To handle this
issue now firmware sends the buckets_scanned mask as part of
wmi_extscan_rssi_info instead of fixed_param.
Change-Id: I5923a5fc642dd722bf6cc9f5496c7cedcf75e1a5
CRs-Fixed: 1001733
diff --git a/core/hdd/src/wlan_hdd_ext_scan.c b/core/hdd/src/wlan_hdd_ext_scan.c
index 6d99b95..51111af 100644
--- a/core/hdd/src/wlan_hdd_ext_scan.c
+++ b/core/hdd/src/wlan_hdd_ext_scan.c
@@ -316,12 +316,12 @@
#define EXTSCAN_CACHED_NL_FIXED_TLV \
((sizeof(data->request_id) + NLA_HDRLEN) + \
(sizeof(data->num_scan_ids) + NLA_HDRLEN) + \
- (sizeof(data->buckets_scanned) + NLA_HDRLEN)+ \
(sizeof(data->more_data) + NLA_HDRLEN))
#define EXTSCAN_CACHED_NL_SCAN_ID_TLV \
((sizeof(result->scan_id) + NLA_HDRLEN) + \
(sizeof(result->flags) + NLA_HDRLEN) + \
- (sizeof(result->num_results) + NLA_HDRLEN))
+ (sizeof(result->num_results) + NLA_HDRLEN))+ \
+ (sizeof(result->buckets_scanned) + NLA_HDRLEN)
#define EXTSCAN_CACHED_NL_SCAN_RESULTS_TLV \
((sizeof(ap->ts) + NLA_HDRLEN) + \
(sizeof(ap->ssid) + NLA_HDRLEN) + \
@@ -368,14 +368,14 @@
hdd_err("cfg80211_vendor_cmd_alloc_reply_skb failed");
goto fail;
}
- hdd_notice("Req Id %u Num_scan_ids %u More Data %u buckets_scanned %u",
- data->request_id, data->num_scan_ids, data->more_data,
- data->buckets_scanned);
+ hdd_notice("Req Id %u Num_scan_ids %u More Data %u",
+ data->request_id, data->num_scan_ids, data->more_data);
result = &data->result[0];
for (i = 0; i < data->num_scan_ids; i++) {
- hdd_notice("[i=%d] scan_id %u flags %u num_results %u",
- i, result->scan_id, result->flags, result->num_results);
+ hdd_notice("[i=%d] scan_id %u flags %u num_results %u buckets scanned %u",
+ i, result->scan_id, result->flags, result->num_results,
+ result->buckets_scanned);
ap = &result->ap[0];
for (j = 0; j < result->num_results; j++) {
@@ -455,7 +455,7 @@
result->flags) ||
nla_put_u32(skb,
QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_BUCKETS_SCANNED,
- data->buckets_scanned) ||
+ result->buckets_scanned) ||
nla_put_u32(skb,
QCA_WLAN_VENDOR_ATTR_EXTSCAN_NUM_RESULTS_AVAILABLE,
result->num_results)) {