qcacld-3.0: Fill validity timer in BTM Request event

Validity timer value is printed wrongly in logcat
logs for BTM request event. This is because the value
is filled from disassociation timer instead of the
validity timer field.
Also the neighbor report related prints are seen
only if the roam msg info TLV is present, which is
not correct.

Fill validity timer in BTM Request event and print the
neighbor report related prints on receiving 11kv
TLV.

Change-Id: I59606f27b0836ea567fed561bbe19f600377d3ed
CRs-Fixed: 3069855

components/umac/mlme/connection_mgr/dispatcher/src/wlan_cm_roam_api.c

@@ -3148,6 +3148,10 @@ cm_roam_stats_event_handler(struct wlan_objmgr_psoc *psoc,
 				goto err;
 		}
 
+		if (stats_info->data_11kv[i].present)
+			cm_roam_stats_print_11kv_info(&stats_info->data_11kv[i],
+						      stats_info->vdev_id);
+
 		/*
 		 * Print BTM resp TLV info (wmi_roam_btm_response_info) only
 		 * when trigger reason is BTM or WTC_BTM. As for other roam
@@ -3177,10 +3181,6 @@ cm_roam_stats_event_handler(struct wlan_objmgr_psoc *psoc,
 			cm_roam_stats_print_roam_msg_info(
 						  &stats_info->roam_msg_info[i],
 						  stats_info->vdev_id);
-			if (stats_info->data_11kv[i].present)
-				cm_roam_stats_print_11kv_info(
-						      &stats_info->data_11kv[i],
-						      stats_info->vdev_id);
 		}
 
 		cm_report_roam_rt_stats(psoc, stats_info->vdev_id,

components/wmi/src/wmi_unified_roam_tlv.c

@@ -3044,6 +3044,19 @@ extract_roam_stats_event_tlv(wmi_unified_t wmi_handle, uint8_t *evt_buf,
 			goto err;
 		}
 
+		/* BTM req/resp or Neighbor report/response info */
+		status = wmi_unified_extract_roam_11kv_stats(
+				      wmi_handle,
+				      evt_buf,
+				      &stats_info->data_11kv[i],
+				      i, num_rpt);
+		if (QDF_IS_STATUS_ERROR(status))
+			wmi_debug_rl("Roam 11kv stats extract fail vdev %d iter %d",
+				     vdev_id, i);
+
+		if (stats_info->data_11kv[i].present)
+			num_rpt += stats_info->data_11kv[i].num_freq;
+
 		/* BTM resp info */
 		status = wmi_unified_extract_roam_btm_response(wmi_handle,
 							evt_buf,
@@ -3086,21 +3099,6 @@ extract_roam_stats_event_tlv(wmi_unified_t wmi_handle, uint8_t *evt_buf,
 				status = QDF_STATUS_E_INVAL;
 				goto err;
 			}
-			if (roam_msg_info[i].present && i < num_tlv) {
-			     /* BTM req/resp or Neighbor report/response info */
-				status = wmi_unified_extract_roam_11kv_stats(
-						      wmi_handle,
-						      evt_buf,
-						      &stats_info->data_11kv[i],
-						      i, num_rpt);
-				if (QDF_IS_STATUS_ERROR(status)) {
-					wmi_debug_rl("Roam 11kv stats extract fail vdev %d iter %d",
-						     vdev_id, i);
-					status = QDF_STATUS_E_INVAL;
-					goto err;
-				}
-				num_rpt += stats_info->data_11kv[i].num_freq;
-			}
 		}
 	}
 	return QDF_STATUS_SUCCESS;

core/hdd/src/wlan_hdd_connectivity_logging.c

@@ -465,7 +465,7 @@ connectivity_attr_table[QCA_WLAN_VENDOR_DIAG_EVENT_TYPE_MAX + 1]
 	{QCA_WLAN_VENDOR_ATTR_DIAG_BTM_DISASSOC_TIMER, NLA_U16,
 	 sizeof(uint16_t), GET_ATTR_OFFSET(btm_info.disassoc_timer)},
 	{QCA_WLAN_VENDOR_ATTR_DIAG_BTM_VALIDITY_INTERVAL, NLA_U8,
-	 sizeof(uint8_t), GET_ATTR_OFFSET(btm_info.disassoc_timer)},
+	 sizeof(uint8_t), GET_ATTR_OFFSET(btm_info.validity_timer)},
 	{QCA_WLAN_VENDOR_ATTR_DIAG_BTM_CANDIDATE_LIST_COUNT, NLA_U8,
 	 sizeof(uint8_t), GET_ATTR_OFFSET(btm_info.candidate_list_count)},
 	{QCA_WLAN_VENDOR_ATTR_DIAG_FIRMWARE_TIMESTAMP, NLA_U64,