qcacld-3.0: Fix token and reason code copy in cm_roam_btm_query_event

In cm_roam_btm_query_event, token and reason code is not
copied to wlan_log_record.

Add changes to copy token and reason code to wlan_log_record
in cm_roam_trigger_info_event.

Change-Id: I7e90017070edd61215eaea77fd3af22ae9465d83
CRs-Fixed: 3071239

components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_offload.c

@@ -5252,6 +5252,8 @@ cm_roam_btm_query_event(struct wmi_neighbor_report_data *btm_data,
 	log_record->timestamp_us = qdf_get_time_of_the_day_us();
 	log_record->fw_timestamp_us = btm_data->timestamp * 1000;
 	log_record->vdev_id = vdev_id;
+	log_record->btm_info.token = btm_data->btm_query_token;
+	log_record->btm_info.reason = btm_data->btm_query_reason;
 
 	status = wlan_connectivity_log_enqueue(log_record);
 	qdf_mem_free(log_record);

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

@@ -2976,6 +2976,9 @@ cm_roam_stats_print_roam_result(struct wmi_roam_result *res,
 	qdf_mem_free(buf);
 }
 
+#define WLAN_ROAM_11KV_REQ_TYPE_BTM        1
+#define WLAN_ROAM_11KV_REQ_TYPE_NEIGH_RPT  2
+
 /**
  * cm_roam_stats_print_11kv_info  - Print neighbor report/BTM related data
  * @neigh_rpt: Pointer to the extracted TLV structure
@@ -3023,17 +3026,23 @@ cm_roam_stats_print_11kv_info(struct wmi_neighbor_report_data *neigh_rpt,
 
 	mlme_get_converted_timestamp(neigh_rpt->req_time, time);
 	mlme_nofl_info("%s [%s] VDEV[%d]", time,
-		       (type == 1) ? "BTM_QUERY" : "NEIGH_RPT_REQ", vdev_id);
+		       (type == WLAN_ROAM_11KV_REQ_TYPE_BTM) ?
+		       "BTM_QUERY" : "NEIGH_RPT_REQ", vdev_id);
+
+	if (type == WLAN_ROAM_11KV_REQ_TYPE_BTM)
+		cm_roam_btm_query_event(neigh_rpt, vdev_id);
 
 	if (neigh_rpt->resp_time) {
 		mlme_get_converted_timestamp(neigh_rpt->resp_time, time1);
 		mlme_nofl_info("%s [%s] VDEV[%d] %s", time1,
-			       (type == 1) ? "BTM_REQ" : "NEIGH_RPT_RSP",
+			       (type == WLAN_ROAM_11KV_REQ_TYPE_BTM) ?
+			       "BTM_REQ" : "NEIGH_RPT_RSP",
 			       vdev_id,
 			       (num_ch > 0) ? buf : "NO Ch update");
 	} else {
 		mlme_nofl_info("%s No response received from AP",
-			       (type == 1) ? "BTM" : "NEIGH_RPT");
+			       (type == WLAN_ROAM_11KV_REQ_TYPE_BTM) ?
+			       "BTM" : "NEIGH_RPT");
 	}
 	qdf_mem_free(buf);
 }