qcacld-3.0: Incorrect TX status in logging after Roaming

In the api cm_roam_mgmt_frame_event(), TX status is sent
without conversion to the userspace resulting in
wrong value of tx status during logging.

Correct this by converting the tx status value before
sending to userspace in order for userspace to properly
evaluate the tx status.

Change-Id: Ie4b6b8bff5e8b9c88edfaf303ce6a4ae370edd67
CRs-Fixed: 3250473

components/cmn_services/logging/inc/wlan_connectivity_logging.h

@@ -27,7 +27,7 @@
 #include "wlan_logging_sock_svc.h"
 #include "wlan_cm_roam_public_struct.h"
 
-#define WLAN_MAX_LOGGING_FREQ 90
+#define WLAN_MAX_LOGGING_FREQ 120
 
 /**
  * enum wlan_main_tag  - Main Tag used in logging
@@ -401,13 +401,13 @@ struct wlan_diag_btm_info {
  * @tx_status: Frame TX status defined by enum qdf_dp_tx_rx_status
  * @reason: reason code defined in Table 9-49 Reason codes field’ from the
  * IEEE 802.11 standard document.
- * @eap_len: EAP data length
- * @eap_type: EAP type. Values defined by IANA at:
- * https://www.iana.org/assignments/eap-numbers
  * @is_retry_frame: Retry frame indicator
  * @reserved: Reserved field
  * @subtype: Diag event defined in  enum qca_conn_diag_log_event_type
  * @assoc_id: Association ID
+ * @eap_len: EAP data length
+ * @eap_type: EAP type. Values defined by IANA at:
+ * https://www.iana.org/assignments/eap-numbers
  * @sn: Frame sequence number
  * @rssi: Peer RSSI in dBm
  */
@@ -420,13 +420,13 @@ struct wlan_diag_packet_info {
 	uint8_t status;
 	uint8_t tx_status;
 	uint8_t reason;
-	uint8_t eap_len;
-	uint8_t eap_type;
 	uint8_t is_retry_frame:1;
 	uint8_t reserved:7;
 	uint16_t subtype;
 	uint16_t assoc_id;
-	uint16_t sn;
+	uint16_t eap_len;
+	uint16_t eap_type;
+	uint32_t sn;
 	int32_t rssi;
 } qdf_packed;
 

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

@@ -6625,7 +6625,8 @@ cm_roam_btm_candidate_event(struct wmi_btm_req_candidate_info *btm_data,
 
 QDF_STATUS
 cm_roam_btm_req_event(struct wmi_roam_btm_trigger_data *btm_data,
-		      uint8_t vdev_id)
+		      struct wmi_roam_trigger_info *trigger_info,
+		      uint8_t vdev_id, bool is_wtc)
 {
 	uint8_t i;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
@@ -6653,6 +6654,10 @@ cm_roam_btm_req_event(struct wmi_roam_btm_trigger_data *btm_data,
 	wlan_diag_event.cand_lst_cnt = btm_data->candidate_list_count;
 
 	WLAN_HOST_DIAG_EVENT_REPORT(&wlan_diag_event, EVENT_WLAN_BTM);
+
+	if (is_wtc)
+		cm_roam_wtc_btm_event(trigger_info, NULL, vdev_id, true);
+
 	for (i = 0; i < btm_data->candidate_list_count; i++)
 		cm_roam_btm_candidate_event(&btm_data->btm_cand[i], vdev_id, i);
 
@@ -6679,7 +6684,8 @@ cm_roam_mgmt_frame_event(struct roam_frame_info *frame_data,
 	wlan_diag_event.sn = frame_data->seq_num;
 	wlan_diag_event.auth_algo = frame_data->auth_algo;
 	wlan_diag_event.rssi = (-1) * frame_data->rssi;
-	wlan_diag_event.tx_status = frame_data->tx_status;
+	wlan_diag_event.tx_status =
+				wlan_get_diag_tx_status(frame_data->tx_status);
 	wlan_diag_event.status = frame_data->status_code;
 	wlan_diag_event.assoc_id = frame_data->assoc_id;
 
@@ -6896,7 +6902,8 @@ cm_roam_btm_candidate_event(struct wmi_btm_req_candidate_info *btm_data,
 
 QDF_STATUS
 cm_roam_btm_req_event(struct wmi_roam_btm_trigger_data *btm_data,
-		      uint8_t vdev_id)
+		      struct wmi_roam_trigger_info *trigger_info,
+		      uint8_t vdev_id, bool is_wtc)
 {
 	struct wlan_log_record *log_record = NULL;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
@@ -6927,6 +6934,10 @@ cm_roam_btm_req_event(struct wmi_roam_btm_trigger_data *btm_data,
 				btm_data->candidate_list_count;
 
 	status = wlan_connectivity_log_enqueue(log_record);
+
+	if (is_wtc)
+		cm_roam_wtc_btm_event(trigger_info, NULL, vdev_id, true);
+
 	for (i = 0; i < log_record->btm_info.candidate_list_count; i++)
 		cm_roam_btm_candidate_event(&btm_data->btm_cand[i], vdev_id, i);
 

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

@@ -514,12 +514,15 @@ cm_roam_mgmt_frame_event(struct roam_frame_info *frame_data,
  * cm_roam_btm_req_event  - Send BTM request related logging event
  * @btm_data: BTM trigger related data
  * @vdev_id: Vdev id
+ * @trigger_info: Roam trigger related info
+ * @is_wtc: Is WTC or BTM response
  *
  * Return: QDF_STATUS
  */
 QDF_STATUS
 cm_roam_btm_req_event(struct wmi_roam_btm_trigger_data *btm_data,
-		      uint8_t vdev_id);
+		      struct wmi_roam_trigger_info *trigger_info,
+		      uint8_t vdev_id, bool is_wtc);
 
 /**
  * cm_roam_btm_resp_event() - Send BTM response logging event
@@ -569,7 +572,8 @@ cm_roam_mgmt_frame_event(struct roam_frame_info *frame_data,
 
 static inline QDF_STATUS
 cm_roam_btm_req_event(struct wmi_roam_btm_trigger_data *btm_data,
-		      uint8_t vdev_id)
+		      struct wmi_roam_trigger_info *trigger_info,
+		      uint8_t vdev_id, bool is_wtc)
 {
 	return QDF_STATUS_E_NOSUPPORT;
 }

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

@@ -2718,7 +2718,8 @@ cm_roam_stats_get_trigger_detail_str(struct wmi_roam_trigger_info *ptr,
 	case ROAM_TRIGGER_REASON_UNIT_TEST:
 		break;
 	case ROAM_TRIGGER_REASON_BTM:
-		cm_roam_btm_req_event(&ptr->btm_trig_data, vdev_id);
+		cm_roam_btm_req_event(&ptr->btm_trig_data, ptr, vdev_id,
+				      false);
 		buf_cons = qdf_snprint(
 				temp, buf_left,
 				"Req_mode: %d Disassoc_timer: %d",
@@ -3261,6 +3262,7 @@ cm_roam_stats_event_handler(struct wlan_objmgr_psoc *psoc,
 			    struct roam_stats_event *stats_info)
 {
 	uint8_t i, rem_tlv = 0;
+	bool is_wtc = false;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
 	if (!stats_info)
@@ -3355,17 +3357,26 @@ cm_roam_stats_event_handler(struct wlan_objmgr_psoc *psoc,
 		 * wmi_roam_trigger_reason TLV is sent only for userspace
 		 * logging of BTM/WTC frame without roam scans.
 		 */
-		if (stats_info->trigger[0].present &&
-		    stats_info->trigger[0].trigger_reason ==
-		    ROAM_TRIGGER_REASON_BTM)
-			cm_roam_btm_req_event(
-				&stats_info->trigger[0].btm_trig_data,
-				stats_info->vdev_id);
 
 		if (stats_info->data_11kv[0].present)
 			cm_roam_stats_print_11kv_info(&stats_info->data_11kv[0],
 						      stats_info->vdev_id);
 
+		if (stats_info->trigger[0].present &&
+		    (stats_info->trigger[0].trigger_reason ==
+		     ROAM_TRIGGER_REASON_BTM ||
+		     stats_info->trigger[0].trigger_reason ==
+		     ROAM_TRIGGER_REASON_WTC_BTM)) {
+			if (stats_info->trigger[0].trigger_reason ==
+			    ROAM_TRIGGER_REASON_WTC_BTM)
+				is_wtc = true;
+
+			cm_roam_btm_req_event(
+				&stats_info->trigger[0].btm_trig_data,
+				&stats_info->trigger[0], stats_info->vdev_id,
+				is_wtc);
+		}
+
 		if (stats_info->scan[0].present &&
 		    stats_info->trigger[0].present)
 			cm_roam_stats_print_scan_info(psoc,