qcacld-3.0: Fill and send connectivity logging management frame events

Fill the management frame data and enqueue the filled record to the logging
queue.
Frame sequence number, peer rssi, tx_status, authentiation algo,
authentication frame transaction sequence number will be filled to the
log record.

Change-Id: I069b7816fdc52eeed964d6586c52b58d1a5d5cd4
CRs-Fixed: 3030075

components/cmn_services/logging/inc/wlan_connectivity_logging.h

@@ -231,6 +231,7 @@ struct wlan_roam_btm_info {
  * @frame_status_code: Frame status code/reason code
  * @seq_num: Frame sequence number
  * @rssi: Peer rssi
+ * @is_retry_frame: is frame retried
  */
 struct wlan_packet_info {
 	uint8_t tx_status;
@@ -242,6 +243,7 @@ struct wlan_packet_info {
 	uint16_t frame_status_code;
 	uint16_t seq_num;
 	int32_t rssi;
+	bool is_retry_frame;
 };
 
 /**
@@ -256,6 +258,8 @@ struct wlan_packet_info {
  * @group: Group cipher suite
  * @group_mgmt: Group manangement cipher suite
  * @auth_type: Authentication Algo
+ * @conn_status: Connection failure status defined by enum
+ * wlan_cm_connect_fail_reason
  * @is_bt_coex_active: Is there active bluetooth connection
  */
 struct wlan_connect_info {
@@ -269,6 +273,7 @@ struct wlan_connect_info {
 	uint32_t group;
 	uint32_t group_mgmt;
 	uint8_t auth_type;
+	enum wlan_cm_connect_fail_reason conn_status;
 	bool is_bt_coex_active;
 };
 
@@ -398,6 +403,35 @@ QDF_STATUS wlan_connectivity_log_dequeue(void);
  * Return: QDF_STATUS
  */
 QDF_STATUS wlan_connectivity_log_enqueue(struct wlan_log_record *new_record);
+
+/**
+ * wlan_connectivity_mgmt_event()  - Fill and enqueue a new record
+ * for management frame information.
+ * @mac_hdr: 802.11 management frame header
+ * @vdev_id: Vdev id
+ * @status_code: Frame status code as defined in IEEE 802.11 - 2020 standard
+ * section 9.4.1.9
+ * @tx_status: Frame TX status defined by enum qdf_dp_tx_rx_status
+ * @peer_rssi: Peer RSSI in dBm
+ * @auth_algo: Authentication algorithm number field as defined in IEEE 802.11 -
+ * 2020 standard section 9.4.1.1
+ * @auth_type: indicates SAE authentication frame type. Possible values are:
+ * 1 - SAE commit frame
+ * 2 - SAE confirm frame
+ * @auth_seq: Authentication frame transaction sequence number as defined in
+ * IEEE 802.11 - 2020 standard section 9.4.1.2
+ * @tag: Record type main tag
+ *
+ * Return: QDF_STATUS
+ */
+void
+wlan_connectivity_mgmt_event(struct wlan_frame_hdr *mac_hdr,
+			     uint8_t vdev_id, uint16_t status_code,
+			     enum qdf_dp_tx_rx_status tx_status,
+			     int8_t peer_rssi,
+			     uint8_t auth_algo, uint8_t auth_type,
+			     uint8_t auth_seq,
+			     enum wlan_main_tag tag);
 #else
 static inline void wlan_connectivity_logging_start(void)
 {}
@@ -415,5 +449,15 @@ QDF_STATUS wlan_connectivity_log_enqueue(struct wlan_log_record *new_record)
 {
 	return QDF_STATUS_E_NOSUPPORT;
 }
+
+static inline void
+wlan_connectivity_mgmt_event(struct wlan_frame_hdr *mac_hdr,
+			     uint8_t vdev_id, uint16_t status_code,
+			     enum qdf_dp_tx_rx_status tx_status,
+			     int8_t peer_rssi,
+			     uint8_t auth_algo, uint8_t auth_type,
+			     uint8_t auth_seq,
+			     enum wlan_main_tag tag)
+{}
 #endif
 #endif /* _WLAN_CONNECTIVITY_LOGGING_H_ */

components/cmn_services/logging/src/wlan_connectivity_logging.c

@@ -24,7 +24,6 @@
 #include "wlan_mlme_main.h"
 #include "wlan_connectivity_logging.h"
 
-#ifdef WLAN_FEATURE_CONNECTIVITY_LOGGING
 static struct wlan_connectivity_log_buf_data global_cl;
 
 static void
@@ -72,7 +71,42 @@ void wlan_connectivity_logging_stop(void)
 	vfree(global_cl.head);
 	global_cl.head = NULL;
 }
-#endif
+
+void
+wlan_connectivity_mgmt_event(struct wlan_frame_hdr *mac_hdr,
+			     uint8_t vdev_id, uint16_t status_code,
+			     enum qdf_dp_tx_rx_status tx_status,
+			     int8_t peer_rssi,
+			     uint8_t auth_algo, uint8_t auth_type,
+			     uint8_t auth_seq, enum wlan_main_tag tag)
+{
+	struct wlan_log_record *new_rec;
+
+	new_rec = qdf_mem_malloc(sizeof(*new_rec));
+	if (!new_rec)
+		return;
+
+	new_rec->timestamp_us = qdf_get_time_of_the_day_us();
+	new_rec->vdev_id = vdev_id;
+	new_rec->log_subtype = tag;
+	qdf_copy_macaddr(&new_rec->bssid,
+			 (struct qdf_mac_addr *)&mac_hdr->i_addr3[0]);
+
+	new_rec->pkt_info.tx_status = tx_status;
+	new_rec->pkt_info.rssi = peer_rssi;
+	new_rec->pkt_info.seq_num =
+		(le16toh(*(uint16_t *)mac_hdr->i_seq) >> WLAN_SEQ_SEQ_SHIFT);
+	new_rec->pkt_info.frame_status_code = status_code;
+	new_rec->pkt_info.auth_algo = auth_algo;
+	new_rec->pkt_info.auth_type = auth_type;
+	new_rec->pkt_info.auth_seq_num = auth_seq;
+	new_rec->pkt_info.is_retry_frame =
+		(mac_hdr->i_fc[1] & IEEE80211_FC1_RETRY);
+
+	wlan_connectivity_log_enqueue(new_rec);
+
+	qdf_mem_free(new_rec);
+}
 
 static bool wlan_logging_is_queue_empty(void)
 {

components/mlme/dispatcher/inc/wlan_mlme_public_struct.h

@@ -2643,4 +2643,31 @@ struct wlan_change_bi {
 	uint8_t session_id;
 };
 
+/**
+ * struct mgmt_frame_data  - Management frame related info
+ * @mac_hdr: 802.11 Frame MAC header
+ * @status_code: Frame status code values as defined in
+ * IEEE 802.11 - 2020 standard Table 9-41
+ * @vdev_id: Vdev id
+ * @frame_subtype: Frame subtype as defined in IEEE 802.11 - 2020
+ * standard section 9.2.4.1.3
+ * @auth_algo: Authentication algorithm number field as defined in
+ * IEEE 802.11 - 2020 standard section 9.4.1.1
+ * @auth_type: indicates SAE authentication frame type. Possible values are:
+ * 1 - SAE commit frame
+ * 2 - SAE confirm frame
+ * @auth_seq: Authentication frame transaction sequence number as defined in
+ * IEEE 802.11 - 2020 standard section 9.4.1.2
+ * @rssi: RSSI in dBm
+ */
+struct mgmt_frame_data {
+	struct wlan_frame_hdr mac_hdr;
+	uint16_t status_code;
+	uint8_t vdev_id;
+	uint8_t frame_subtype;
+	uint8_t auth_algo;
+	uint8_t auth_type;
+	uint8_t auth_seq;
+	int16_t rssi;
+};
 #endif

core/hdd/inc/wlan_hdd_connectivity_logging.h

@@ -31,8 +31,40 @@
  * Return: None
  */
 void wlan_hdd_start_connectivity_logging(void);
+
+/**
+ * wlan_hdd_connectivity_event_connecting() - Queue the connecting event to
+ * the logging queue
+ * @hdd_ctx: HDD context
+ * @req: Request
+ * @vdev_id: Vdev id
+ */
+void wlan_hdd_connectivity_event_connecting(struct hdd_context *hdd_ctx,
+					    struct cfg80211_connect_params *req,
+					    uint8_t vdev_id);
+
+/**
+ * wlan_hdd_connectivity_fail_event()- Connectivity queue logging event
+ * @vdev: VDEV object
+ * @rsp: Connection manager connect response
+ *
+ * Return: None
+ */
+void wlan_hdd_connectivity_fail_event(struct wlan_objmgr_vdev *vdev,
+				      struct wlan_cm_connect_resp *rsp);
 #else
 static inline
 void wlan_hdd_start_connectivity_logging(void)
 {}
+
+static inline
+void wlan_hdd_connectivity_event_connecting(struct hdd_context *hdd_ctx,
+					    struct cfg80211_connect_params *req,
+					    uint8_t vdev_id)
+{}
+
+static inline
+void wlan_hdd_connectivity_fail_event(struct wlan_objmgr_vdev *vdev,
+				      struct wlan_cm_connect_resp *rsp)
+{}
 #endif

core/hdd/src/wlan_hdd_cm_connect.c

@@ -26,6 +26,7 @@
 #include "wlan_hdd_trace.h"
 #include "wlan_hdd_object_manager.h"
 #include "wlan_hdd_power.h"
+#include "wlan_hdd_connectivity_logging.h"
 #include <osif_cm_req.h>
 #include <wlan_logging_sock_svc.h>
 #include <wlan_hdd_periodic_sta_stats.h>
@@ -422,6 +423,7 @@ int wlan_hdd_cm_connect(struct wiphy *wiphy,
 
 	hdd_update_scan_ie_for_connect(adapter, &params);
 
+	wlan_hdd_connectivity_event_connecting(hdd_ctx, req, adapter->vdev_id);
 	status = osif_cm_connect(ndev, vdev, req, &params);
 
 	if (status || ucfg_cm_is_vdev_roaming(vdev)) {
@@ -509,6 +511,7 @@ hdd_cm_connect_failure_post_user_update(struct wlan_objmgr_vdev *vdev,
 		hdd_allow_suspend(WIFI_POWER_EVENT_WAKELOCK_CONNECT);
 	}
 
+	wlan_hdd_connectivity_fail_event(vdev, rsp);
 	hdd_clear_roam_profile_ie(adapter);
 	ucfg_cm_reset_key(hdd_ctx->pdev, adapter->vdev_id);
 	hdd_wmm_dscp_initial_state(adapter);

core/hdd/src/wlan_hdd_connectivity_logging.c

@@ -55,3 +55,78 @@ void wlan_hdd_start_connectivity_logging(void)
 			wlan_hdd_send_connectivity_log_to_user;
 	wlan_connectivity_logging_start(&hdd_cb);
 }
+
+void wlan_hdd_connectivity_event_connecting(struct hdd_context *hdd_ctx,
+					    struct cfg80211_connect_params *req,
+					    uint8_t vdev_id)
+{
+	struct wlan_log_record *record;
+
+	record = qdf_mem_malloc(sizeof(*record));
+	if (!record)
+		return;
+
+	record->timestamp_us = qdf_get_time_of_the_day_us();
+	record->vdev_id = vdev_id;
+
+	record->conn_info.ssid_len = req->ssid_len;
+	if (req->ssid_len > WLAN_SSID_MAX_LEN)
+		record->conn_info.ssid_len = WLAN_SSID_MAX_LEN;
+	qdf_mem_copy(record->conn_info.ssid, req->ssid, req->ssid_len);
+
+	if (req->bssid)
+		qdf_mem_copy(record->bssid.bytes, req->bssid,
+			     QDF_MAC_ADDR_SIZE);
+	else if (req->bssid_hint)
+		qdf_mem_copy(record->conn_info.bssid_hint.bytes,
+			     req->bssid_hint,
+			     QDF_MAC_ADDR_SIZE);
+
+	if (req->channel)
+		record->conn_info.freq = req->channel->center_freq;
+
+	if (req->channel_hint)
+		record->conn_info.freq_hint = req->channel_hint->center_freq;
+
+	record->conn_info.pairwise = req->crypto.ciphers_pairwise[0];
+	record->conn_info.group = req->crypto.cipher_group;
+	record->conn_info.akm = req->crypto.akm_suites[0];
+	record->conn_info.auth_type = req->auth_type;
+	if (hdd_ctx->bt_a2dp_active || hdd_ctx->bt_vo_active)
+		record->conn_info.is_bt_coex_active = true;
+
+	wlan_connectivity_log_enqueue(record);
+
+	qdf_mem_free(record);
+}
+
+void
+wlan_hdd_connectivity_fail_event(struct wlan_objmgr_vdev *vdev,
+				 struct wlan_cm_connect_resp *rsp)
+{
+	uint8_t vdev_id;
+	struct wlan_log_record *log;
+	enum QDF_OPMODE op_mode;
+
+	/* Send the event only for failure reason, else return */
+	if (!rsp->reason)
+		return;
+
+	vdev_id = wlan_vdev_get_id(vdev);
+	op_mode = wlan_vdev_mlme_get_opmode(vdev);
+	if (op_mode != QDF_STA_MODE)
+		return;
+
+	log = qdf_mem_malloc(sizeof(*log));
+	if (!log)
+		return;
+
+	log->timestamp_us = qdf_get_time_of_the_day_us();
+	log->vdev_id = vdev_id;
+	log->bssid = rsp->bssid;
+	log->conn_info.freq = rsp->freq;
+	log->conn_info.conn_status = rsp->reason;
+
+	wlan_connectivity_log_enqueue(log);
+	qdf_mem_free(log);
+}

core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c

@@ -44,6 +44,7 @@
 #include "wlan_blm_api.h"
 #include "wlan_mlme_twt_api.h"
 #include "wlan_mlme_ucfg_api.h"
+#include "wlan_connectivity_logging.h"
 
 /**
  * lim_update_stads_htcap() - Updates station Descriptor HT capability
@@ -1081,6 +1082,11 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 			      session_entry,
 			      (assoc_rsp->status_code ? QDF_STATUS_E_FAILURE :
 			       QDF_STATUS_SUCCESS), assoc_rsp->status_code);
+	wlan_connectivity_mgmt_event((struct wlan_frame_hdr *)hdr,
+				     session_entry->vdev_id,
+				     assoc_rsp->status_code, 0, rssi,
+				     0, 0, 0,
+				     WLAN_ASSOC_RSP);
 
 	ap_nss = lim_get_nss_supported_by_ap(&assoc_rsp->VHTCaps,
 					     &assoc_rsp->HTCaps,

core/mac/src/pe/lim/lim_process_auth_frame.c

@@ -43,6 +43,7 @@
 #include "lim_send_messages.h"
 #include "lim_process_fils.h"
 #include "wlan_mlme_api.h"
+#include "wlan_connectivity_logging.h"
 
 /**
  * is_auth_valid
@@ -1605,7 +1606,13 @@ lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 			SIR_MAC_AUTH_FRAME_4;
 	}
 
-
+	wlan_connectivity_mgmt_event((struct wlan_frame_hdr *)mac_hdr,
+				     pe_session->vdev_id,
+				     rx_auth_frm_body->authStatusCode,
+				     0, WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info),
+				     auth_alg, 0,
+				     rx_auth_frm_body->authTransactionSeqNumber,
+				     WLAN_AUTH_RESP);
 	switch (rx_auth_frm_body->authTransactionSeqNumber) {
 	case SIR_MAC_AUTH_FRAME_1:
 		lim_process_auth_frame_type1(mac_ctx,
@@ -1641,6 +1648,10 @@ free:
 		qdf_mem_free(plainbody);
 }
 
+#define SAE_AUTH_SEQ_NUM_OFFSET       2
+#define SAE_AUTH_STATUS_CODE_OFFSET   4
+#define SAE_MESSAGE_TYPE_OFFSET       6
+
 /**
  * lim_process_sae_preauth_frame() - Send the WPA3 preauth SAE frame received
  * to the user space.
@@ -1657,7 +1668,8 @@ bool lim_process_sae_preauth_frame(struct mac_context *mac, uint8_t *rx_pkt)
 {
 	tpSirMacMgmtHdr dot11_hdr;
 	uint16_t auth_alg, frm_len;
-	uint8_t *frm_body, pdev_id;
+	uint16_t sae_auth_seq = 0, sae_status_code = 0, sae_type = 0;
+	uint8_t *frm_body, pdev_id, vdev_id = 0;
 	struct wlan_objmgr_vdev *vdev;
 
 	dot11_hdr = WMA_GET_RX_MAC_HEADER(rx_pkt);
@@ -1673,6 +1685,14 @@ bool lim_process_sae_preauth_frame(struct mac_context *mac, uint8_t *rx_pkt)
 	if (auth_alg != eSIR_AUTH_TYPE_SAE)
 		return false;
 
+	if (frm_len > (SAE_MESSAGE_TYPE_OFFSET + 2)) {
+		sae_auth_seq =
+			*(uint16_t *)(frm_body + SAE_AUTH_SEQ_NUM_OFFSET);
+		sae_status_code =
+			*(uint16_t *)(frm_body + SAE_AUTH_STATUS_CODE_OFFSET);
+		sae_type = *(uint16_t *)(frm_body + SAE_MESSAGE_TYPE_OFFSET);
+	}
+
 	pe_debug("LFR3: SAE auth frame: seq_ctrl:0x%X auth_transaction_num:%d",
 		 ((dot11_hdr->seqControl.seqNumHi << 8) |
 		  (dot11_hdr->seqControl.seqNumLo << 4) |
@@ -1681,10 +1701,17 @@ bool lim_process_sae_preauth_frame(struct mac_context *mac, uint8_t *rx_pkt)
 	vdev = wlan_objmgr_get_vdev_by_macaddr_from_psoc(
 			mac->psoc, pdev_id, dot11_hdr->da, WLAN_LEGACY_SME_ID);
 	if (vdev) {
-		lim_sae_auth_cleanup_retry(mac, vdev->vdev_objmgr.vdev_id);
+		lim_sae_auth_cleanup_retry(mac, wlan_vdev_get_id(vdev));
+		vdev_id = wlan_vdev_get_id(vdev);
 		wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_SME_ID);
 	}
 
+	wlan_connectivity_mgmt_event((struct wlan_frame_hdr *)dot11_hdr,
+				     vdev_id, sae_status_code,
+				     0, WMA_GET_RX_RSSI_NORMALIZED(rx_pkt),
+				     auth_alg, sae_type,
+				     sae_auth_seq, WLAN_AUTH_RESP);
+
 	lim_send_sme_mgmt_frame_ind(mac, dot11_hdr->fc.subType,
 				    (uint8_t *)dot11_hdr,
 				    frm_len + sizeof(tSirMacMgmtHdr),

core/mac/src/pe/lim/lim_process_deauth_frame.c

@@ -38,6 +38,7 @@
 #include "lim_ser_des_utils.h"
 #include "sch_api.h"
 #include "lim_send_messages.h"
+#include "wlan_connectivity_logging.h"
 
 /**
  * lim_process_deauth_frame
@@ -151,6 +152,10 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 			pe_session->limSmeState,
 			GET_LIM_SYSTEM_ROLE(pe_session));
 
+	wlan_connectivity_mgmt_event((struct wlan_frame_hdr *)pHdr,
+				     pe_session->vdev_id, reasonCode,
+				     0, frame_rssi, 0, 0, 0,
+				     WLAN_DEAUTH_RX);
 	lim_diag_event_report(mac, WLAN_PE_DIAG_DEAUTH_FRAME_EVENT,
 		pe_session, 0, reasonCode);
 

core/mac/src/pe/lim/lim_process_disassoc_frame.c

@@ -42,6 +42,7 @@
 #include "lim_send_messages.h"
 #include "sch_api.h"
 #include "wlan_blm_api.h"
+#include "wlan_connectivity_logging.h"
 
 /**
  * lim_process_disassoc_frame
@@ -151,6 +152,10 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 			reasonCode, pe_session->limMlmState,
 			pe_session->limSmeState,
 			GET_LIM_SYSTEM_ROLE(pe_session));
+	wlan_connectivity_mgmt_event((struct wlan_frame_hdr *)pHdr,
+				     pe_session->vdev_id, reasonCode,
+				     0, frame_rssi, 0, 0, 0,
+				     WLAN_DISASSOC_RX);
 	lim_diag_event_report(mac, WLAN_PE_DIAG_DISASSOC_FRAME_EVENT,
 		pe_session, 0, reasonCode);
 

core/mac/src/pe/lim/lim_process_tdls.c

@@ -664,6 +664,7 @@ static QDF_STATUS lim_send_tdls_dis_req_frame(struct mac_context *mac,
 					TID_AC_VI,
 					lim_tx_complete, pFrame,
 					lim_mgmt_tdls_tx_complete,
+					NULL,
 					HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME |
 					HAL_USE_PEER_STA_REQUESTED_MASK,
 					smeSessionId, false, 0,
@@ -1403,7 +1404,7 @@ static QDF_STATUS lim_send_tdls_dis_rsp_frame(struct mac_context *mac,
 					      ANI_TXDIR_IBSS,
 					      0,
 					      lim_tx_complete, pFrame,
-					      lim_mgmt_tdls_tx_complete,
+					      lim_mgmt_tdls_tx_complete, NULL,
 					      HAL_USE_SELF_STA_REQUESTED_MASK,
 					      smeSessionId, false, 0,
 					      RATEID_DEFAULT, 0);
@@ -1487,7 +1488,7 @@ wma_tx_frame_with_tx_complete_send(struct mac_context *mac, void *pPacket,
 					  ANI_TXDIR_TODS,
 					  tid,
 					  lim_tx_complete, pFrame,
-					  lim_mgmt_tdls_tx_complete,
+					  lim_mgmt_tdls_tx_complete, NULL,
 					  HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME
 					  | HAL_USE_PEER_STA_REQUESTED_MASK,
 					  smeSessionId, flag, 0,
@@ -1508,7 +1509,7 @@ wma_tx_frame_with_tx_complete_send(struct mac_context *mac, void *pPacket,
 					  ANI_TXDIR_TODS,
 					  tid,
 					  lim_tx_complete, pFrame,
-					  lim_mgmt_tdls_tx_complete,
+					  lim_mgmt_tdls_tx_complete, NULL,
 					  HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME
 					  | HAL_USE_PEER_STA_REQUESTED_MASK,
 					  smeSessionId, false, 0,

core/mac/src/pe/lim/lim_send_management_frames.c

@@ -56,6 +56,7 @@
 #include <wlan_mlme_api.h>
 #include <wlan_mlme_main.h>
 #include "wlan_crypto_global_api.h"
+#include "wlan_connectivity_logging.h"
 #include "lim_mlo.h"
 
 /**
@@ -1249,8 +1250,8 @@ void lim_send_mscs_req_action_frame(struct mac_context *mac,
 			   (uint16_t) (sizeof(tSirMacMgmtHdr) + payload),
 			   TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7,
 			   lim_tx_complete, frame, lim_mscs_req_tx_complete_cnf,
-			   HAL_USE_PEER_STA_REQUESTED_MASK, pe_session->vdev_id,
-			   false, 0, RATEID_DEFAULT, 0);
+			   NULL, HAL_USE_PEER_STA_REQUESTED_MASK,
+			   pe_session->vdev_id, false, 0, RATEID_DEFAULT, 0);
 	if (QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		mlme_set_is_mscs_req_sent(pe_session->vdev, true);
 	} else {
@@ -1773,7 +1774,7 @@ lim_send_assoc_rsp_mgmt_frame(struct mac_context *mac_ctx,
 				TXRX_FRM_802_11_MGMT,
 				ANI_TXDIR_TODS,
 				7, lim_tx_complete, frame,
-				lim_assoc_rsp_tx_complete, tx_flag,
+				lim_assoc_rsp_tx_complete, NULL, tx_flag,
 				sme_session, false, 0, RATEID_DEFAULT, 0);
 	else
 		qdf_status = wma_tx_frame(
@@ -1956,11 +1957,20 @@ static QDF_STATUS lim_assoc_tx_complete_cnf(void *context,
 	uint16_t assoc_ack_status;
 	uint16_t reason_code;
 	struct mac_context *mac_ctx = (struct mac_context *)context;
+	struct mgmt_frame_data *data;
 
 	pe_nofl_rl_info("Assoc req TX: %s (%d)",
 			(tx_complete == WMI_MGMT_TX_COMP_TYPE_COMPLETE_OK) ?
 			"success" : "fail", tx_complete);
 
+	if (params) {
+		data = params;
+		wlan_connectivity_mgmt_event(&data->mac_hdr, data->vdev_id,
+					     data->status_code, tx_complete,
+					     data->rssi, 0, 0, 0,
+					     WLAN_ASSOC_REQ);
+	}
+
 	if (tx_complete == WMI_MGMT_TX_COMP_TYPE_COMPLETE_OK) {
 		assoc_ack_status = ACKED;
 		reason_code = QDF_STATUS_SUCCESS;
@@ -2080,6 +2090,7 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx,
 {
 	int ret;
 	tDot11fAssocRequest *frm;
+	struct mgmt_frame_data mgmt_data, *mgmt_frame_info = NULL;
 	uint16_t caps;
 	uint8_t *frame, *rsnx_ie = NULL;
 	QDF_STATUS sir_status;
@@ -2714,12 +2725,21 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx,
 
 	peer_rssi = mac_ctx->lim.bss_rssi;
 
+	if (pe_session->opmode == QDF_STA_MODE) {
+		mgmt_data.mac_hdr = *(struct wlan_frame_hdr *)mac_hdr;
+		mgmt_data.status_code = STATUS_SUCCESS;
+		mgmt_data.frame_subtype = MGMT_SUBTYPE_ASSOC_REQ;
+		mgmt_data.rssi = peer_rssi;
+		mgmt_frame_info = &mgmt_data;
+	}
+
 	qdf_status =
 		wma_tx_frameWithTxComplete(mac_ctx, packet,
 			   (uint16_t) (sizeof(tSirMacMgmtHdr) + payload),
 			   TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7,
 			   lim_tx_complete, frame, lim_assoc_tx_complete_cnf,
-			   tx_flag, vdev_id, false, 0, min_rid, peer_rssi);
+			   mgmt_frame_info, tx_flag, vdev_id, false, 0,
+			   min_rid, peer_rssi);
 	MTRACE(qdf_trace
 		       (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 		       pe_session->peSessionId, qdf_status));
@@ -2856,10 +2876,20 @@ static QDF_STATUS lim_auth_tx_complete_cnf(void *context,
 					   void *params)
 {
 	struct mac_context *mac_ctx = (struct mac_context *)context;
+	struct mgmt_frame_data *data;
 	uint16_t auth_ack_status;
 	uint16_t reason_code;
 	bool sae_auth_acked;
 
+	if (params) {
+		data = params;
+		wlan_connectivity_mgmt_event(&data->mac_hdr, data->vdev_id,
+					     data->status_code, tx_complete,
+					     data->rssi, data->auth_algo,
+					     data->auth_type, data->auth_seq,
+					     WLAN_AUTH_REQ);
+	}
+
 	pe_nofl_rl_info("Auth TX: %s (%d)",
 			(tx_complete == WMI_MGMT_TX_COMP_TYPE_COMPLETE_OK) ?
 			"success" : "fail", tx_complete);
@@ -2918,6 +2948,7 @@ lim_send_auth_mgmt_frame(struct mac_context *mac_ctx,
 	uint8_t *frame, *body;
 	uint32_t frame_len = 0, body_len = 0;
 	tpSirMacMgmtHdr mac_hdr;
+	struct mgmt_frame_data mgmt_data, *auth_frame_info = NULL;
 	void *packet;
 	QDF_STATUS qdf_status, status;
 	uint8_t tx_flag = 0;
@@ -3198,6 +3229,17 @@ alloc_packet:
 	lim_diag_mgmt_tx_event_report(mac_ctx, mac_hdr,
 				      session, QDF_STATUS_SUCCESS, QDF_STATUS_SUCCESS);
 
+	if (session->opmode == QDF_STA_MODE) {
+		mgmt_data.mac_hdr = *(struct wlan_frame_hdr *)mac_hdr;
+		mgmt_data.status_code = auth_frame->authStatusCode;
+		mgmt_data.rssi = peer_rssi;
+		mgmt_data.frame_subtype = MGMT_SUBTYPE_AUTH;
+		mgmt_data.auth_algo = auth_frame->authAlgoNumber;
+		mgmt_data.auth_seq = MGMT_SUBTYPE_AUTH;
+
+		auth_frame_info = &mgmt_data;
+	}
+
 	if (session->ftPEContext.pFTPreAuthReq)
 		ch_freq_tx_frame = session->ftPEContext.
 				pFTPreAuthReq->pre_auth_channel_freq;
@@ -3206,7 +3248,7 @@ alloc_packet:
 				 (uint16_t)frame_len,
 				 TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS,
 				 7, lim_tx_complete, frame,
-				 lim_auth_tx_complete_cnf,
+				 lim_auth_tx_complete_cnf, auth_frame_info,
 				 tx_flag, vdev_id, false,
 				 ch_freq_tx_frame, min_rid, peer_rssi);
 	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
@@ -3456,6 +3498,15 @@ static QDF_STATUS lim_disassoc_tx_complete_cnf_handler(void *context,
 	struct mac_context *max_ctx = (struct mac_context *)context;
 	QDF_STATUS status_code;
 	struct scheduler_msg msg = {0};
+	struct mgmt_frame_data *data;
+
+	if (params) {
+		data = params;
+		wlan_connectivity_mgmt_event(&data->mac_hdr, data->vdev_id,
+					     data->status_code, tx_success,
+					     data->rssi, 0, 0, 0,
+					     WLAN_DISASSOC_TX);
+	}
 
 	pe_debug("tx_success: %d", tx_success);
 
@@ -3493,6 +3544,15 @@ static QDF_STATUS lim_deauth_tx_complete_cnf_handler(void *context,
 	struct scheduler_msg msg = {0};
 	tLimMlmDeauthReq *deauth_req;
 	struct pe_session *session = NULL;
+	struct mgmt_frame_data *data;
+
+	if (params) {
+		data = params;
+		wlan_connectivity_mgmt_event(&data->mac_hdr, data->vdev_id,
+					     data->status_code, tx_success,
+					     data->rssi, 0, 0, 0,
+					     WLAN_DEAUTH_TX);
+	}
 
 	deauth_req = mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDeauthReq;
 
@@ -3575,6 +3635,7 @@ lim_send_disassoc_mgmt_frame(struct mac_context *mac,
 			     struct pe_session *pe_session, bool waitForAck)
 {
 	tDot11fDisassociation frm;
+	struct mgmt_frame_data mgmt_data, *mgmt_frame_info = NULL;
 	uint8_t *pFrame;
 	tpSirMacMgmtHdr pMacHdr;
 	uint32_t nBytes, nPayload, nStatus;
@@ -3692,6 +3753,15 @@ lim_send_disassoc_mgmt_frame(struct mac_context *mac,
 		lim_diag_mgmt_tx_event_report(mac, pMacHdr,
 					      pe_session, QDF_STATUS_SUCCESS,
 					      QDF_STATUS_SUCCESS);
+
+		if (pe_session->opmode == QDF_STA_MODE) {
+			mgmt_data.mac_hdr = *(struct wlan_frame_hdr *)pMacHdr;
+			mgmt_data.status_code = nReason;
+			mgmt_data.frame_subtype = MGMT_SUBTYPE_DISASSOC;
+			mgmt_data.rssi = mac->lim.bss_rssi;
+			mgmt_frame_info = &mgmt_data;
+		}
+
 		/* Queue Disassociation frame in high priority WQ */
 		/* get the duration from the request */
 		qdf_status =
@@ -3699,6 +3769,7 @@ lim_send_disassoc_mgmt_frame(struct mac_context *mac,
 					 TXRX_FRM_802_11_MGMT,
 					 ANI_TXDIR_TODS, 7, lim_tx_complete,
 					 pFrame, lim_disassoc_tx_complete_cnf_handler,
+					 mgmt_frame_info,
 					 txFlag, smeSessionId, false, 0,
 					 RATEID_DEFAULT, 0);
 		MTRACE(qdf_trace
@@ -3772,6 +3843,8 @@ lim_send_deauth_mgmt_frame(struct mac_context *mac,
 			   struct pe_session *pe_session, bool waitForAck)
 {
 	tDot11fDeAuth frm;
+	struct mgmt_frame_data mgmt_data;
+	void *mgmt_frame_info = NULL;
 	uint8_t *pFrame;
 	tpSirMacMgmtHdr pMacHdr;
 	uint32_t nBytes, nPayload, nStatus;
@@ -3900,12 +3973,22 @@ lim_send_deauth_mgmt_frame(struct mac_context *mac,
 			qdf_mem_copy(pe_session->deauth_retry.peer_macaddr.bytes,
 					 peer, QDF_MAC_ADDR_SIZE);
 		}
+
+		if (pe_session->opmode == QDF_STA_MODE) {
+			mgmt_data.mac_hdr = *(struct wlan_frame_hdr *)pMacHdr;
+			mgmt_data.status_code = nReason;
+			mgmt_data.rssi = mac->lim.bss_rssi;
+			mgmt_data.frame_subtype = MGMT_SUBTYPE_DEAUTH;
+			mgmt_frame_info = &mgmt_data;
+		}
+
 		/* Queue Disassociation frame in high priority WQ */
 		qdf_status =
 			wma_tx_frameWithTxComplete(mac, pPacket, (uint16_t) nBytes,
 					 TXRX_FRM_802_11_MGMT,
 					 ANI_TXDIR_TODS, 7, lim_tx_complete,
 					 pFrame, lim_deauth_tx_complete_cnf_handler,
+					 mgmt_frame_info,
 					 txFlag, smeSessionId, false, 0,
 					 RATEID_DEFAULT, 0);
 		MTRACE(qdf_trace
@@ -4622,7 +4705,7 @@ lim_p2p_oper_chan_change_confirm_action_frame(struct mac_context *mac_ctx,
 			(uint16_t)num_bytes,
 			TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS,
 			7, lim_tx_complete, frame,
-			lim_oper_chan_change_confirm_tx_complete_cnf,
+			lim_oper_chan_change_confirm_tx_complete_cnf, NULL,
 			tx_flag, vdev_id, false, 0, RATEID_DEFAULT, 0);
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
@@ -5584,7 +5667,7 @@ QDF_STATUS lim_send_addba_response_frame(struct mac_context *mac_ctx,
 						ANI_TXDIR_TODS, 7,
 						NULL, frame_ptr,
 						lim_addba_rsp_tx_complete_cnf,
-						tx_flag, vdev_id,
+						NULL, tx_flag, vdev_id,
 						false, 0, RATEID_DEFAULT, 0);
 	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 			 session->peSessionId, qdf_status));
@@ -5745,7 +5828,7 @@ QDF_STATUS lim_send_delba_action_frame(struct mac_context *mac_ctx,
 						ANI_TXDIR_TODS, 7,
 						NULL, frame_ptr,
 						lim_delba_tx_complete_cnf,
-						tx_flag, vdev_id,
+						NULL, tx_flag, vdev_id,
 						false, 0, RATEID_DEFAULT, 0);
 	if (qdf_status != QDF_STATUS_SUCCESS) {
 		pe_err("delba wma_tx_frame FAILED! Status [%d]", qdf_status);
@@ -5761,6 +5844,8 @@ error_delba:
 	return qdf_status;
 }
 
+#define MAC_AUTH_FRAME_STATUS_CODE_OFFSET 4
+
 /**
  * lim_tx_mgmt_frame() - Transmits Auth mgmt frame
  * @mac_ctx Pointer to Global MAC structure
@@ -5774,6 +5859,7 @@ error_delba:
 static void lim_tx_mgmt_frame(struct mac_context *mac_ctx, uint8_t vdev_id,
 			      uint32_t msg_len, void *packet, uint8_t *frame)
 {
+	struct mgmt_frame_data mgmt_data, *mgmt_frame_info = NULL;
 	tpSirMacFrameCtl fc = (tpSirMacFrameCtl)frame;
 	QDF_STATUS qdf_status;
 	struct pe_session *session;
@@ -5794,11 +5880,25 @@ static void lim_tx_mgmt_frame(struct mac_context *mac_ctx, uint8_t vdev_id,
 	mac_ctx->auth_ack_status = LIM_ACK_NOT_RCD;
 	min_rid = lim_get_min_session_txrate(session);
 
+	if (fc->subType == SIR_MAC_MGMT_AUTH &&
+	    session->opmode == QDF_STA_MODE &&
+	    msg_len >= (sizeof(struct wlan_frame_hdr) +
+			MAC_AUTH_FRAME_STATUS_CODE_OFFSET + 2)) {
+		mgmt_data.mac_hdr = *(struct wlan_frame_hdr *)frame;
+		mgmt_data.status_code =
+			*(uint16_t *)(frame + sizeof(struct wlan_frame_hdr) +
+				      MAC_AUTH_FRAME_STATUS_CODE_OFFSET);
+		mgmt_data.rssi = mac_ctx->lim.bss_rssi;
+		mgmt_data.frame_subtype = MGMT_SUBTYPE_AUTH;
+		mgmt_frame_info = &mgmt_data;
+	}
+
 	qdf_status = wma_tx_frameWithTxComplete(mac_ctx, packet,
 					 (uint16_t)msg_len,
 					 TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS,
 					 7, lim_tx_complete, frame,
 					 lim_auth_tx_complete_cnf,
+					 mgmt_frame_info,
 					 0, vdev_id, false, 0, min_rid, 0);
 	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 		session->peSessionId, qdf_status));

core/wma/inc/wma.h

@@ -810,6 +810,8 @@ struct wma_wlm_stats_data {
  *   set this and wait will timeout, and code will poll the pending tx
  *   descriptors number to be zero.
  * @umac_ota_ack_cb: Ack Complete Callback registered by umac
+ * @is_mgmt_data_valid: Is management frame data valid
+ * @mgmt_data: Management frame related data
  * @umac_data_ota_ack_cb: ack complete callback
  * @last_umac_data_ota_timestamp: timestamp when OTA of last umac data
  *   was done
@@ -934,6 +936,8 @@ typedef struct {
 	qdf_event_t tx_frm_download_comp_event;
 	qdf_event_t tx_queue_empty_event;
 	wma_tx_ota_comp_callback umac_data_ota_ack_cb;
+	bool is_mgmt_data_valid;
+	struct mgmt_frame_data mgmt_data;
 	unsigned long last_umac_data_ota_timestamp;
 	qdf_nbuf_t last_umac_data_nbuf;
 	wma_tgt_cfg_cb tgt_cfg_update_cb;

core/wma/inc/wma_types.h

@@ -459,6 +459,7 @@ enum wmamsgtype {
 		      (pCompFunc), \
 		      (pData), \
 		      (NULL), \
+		      (NULL), \
 		      (txFlag), \
 		      (sessionid), \
 		      (false), \
@@ -467,8 +468,8 @@ enum wmamsgtype {
 		      (peer_rssi)))
 
 #define wma_tx_frameWithTxComplete(hHal, pFrmBuf, frmLen, frmType, txDir, tid, \
-	 pCompFunc, pData, pCBackFnTxComp, txFlag, sessionid, tdlsflag, \
-	 channel_freq, rid, peer_rssi) \
+	 pCompFunc, pData, pCBackFnTxComp, ota_comp_data, txFlag, sessionid, \
+	 tdlsflag, channel_freq, rid, peer_rssi) \
 	(QDF_STATUS)( wma_tx_packet( \
 		      cds_get_context(QDF_MODULE_ID_WMA), \
 		      (pFrmBuf), \
@@ -479,6 +480,7 @@ enum wmamsgtype {
 		      (pCompFunc), \
 		      (pData), \
 		      (pCBackFnTxComp), \
+		      (ota_comp_data), \
 		      (txFlag), \
 		      (sessionid), \
 		      (tdlsflag), \
@@ -671,7 +673,8 @@ void wma_tx_abort(uint8_t vdev_id);
  * @tid: TID
  * @tx_frm_download_comp_cb: tx download callback handler
  * @pData: tx packet
- * @tx_frm_ota_comp_cb: OTA complition handler
+ * @tx_frm_ota_comp_cb: OTA completion handler
+ * @ota_comp_data: OTA completion data
  * @tx_flag: tx flag
  * @vdev_id: vdev id
  * @tdls_flag: tdls flag
@@ -690,6 +693,7 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen,
 			 wma_tx_dwnld_comp_callback tx_frm_download_comp_cb,
 			 void *pData,
 			 wma_tx_ota_comp_callback tx_frm_ota_comp_cb,
+			 struct mgmt_frame_data *ota_comp_data,
 			 uint8_t tx_flag, uint8_t vdev_id, bool tdls_flag,
 			 uint16_t channel_freq, enum rateid rid,
 			 int8_t peer_rssi);

core/wma/src/wma_data.c

@@ -2274,6 +2274,7 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen,
 			 wma_tx_dwnld_comp_callback tx_frm_download_comp_cb,
 			 void *pData,
 			 wma_tx_ota_comp_callback tx_frm_ota_comp_cb,
+			 struct mgmt_frame_data *ota_comp_data,
 			 uint8_t tx_flag, uint8_t vdev_id, bool tdls_flag,
 			 uint16_t channel_freq, enum rateid rid,
 			 int8_t peer_rssi)
@@ -2605,6 +2606,13 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen,
 			tx_frm_index =
 				GENERIC_NODOWNLD_NOACK_COMP_INDEX;
 		}
+
+		if (ota_comp_data) {
+			wma_handle->is_mgmt_data_valid = true;
+			wma_handle->mgmt_data = *ota_comp_data;
+		} else {
+			wma_handle->is_mgmt_data_valid = false;
+		}
 	}
 
 	/*

core/wma/src/wma_mgmt.c

@@ -2642,6 +2642,7 @@ static int wma_process_mgmt_tx_completion(tp_wma_handle wma_handle,
 					  uint32_t desc_id, uint32_t status)
 {
 	struct wlan_objmgr_pdev *pdev;
+	void *frame_data;
 	qdf_nbuf_t buf = NULL;
 	QDF_STATUS ret;
 #if !defined(REMOVE_PKT_LOG)
@@ -2680,8 +2681,13 @@ static int wma_process_mgmt_tx_completion(tp_wma_handle wma_handle,
 			      buf, pktdump_status, TX_MGMT_PKT);
 #endif
 
+	if (wma_handle->is_mgmt_data_valid)
+		frame_data = &wma_handle->mgmt_data;
+	else
+		frame_data = &mgmt_params;
+
 	ret = mgmt_txrx_tx_completion_handler(pdev, desc_id, status,
-					      &mgmt_params);
+					      frame_data);
 
 	if (ret != QDF_STATUS_SUCCESS) {
 		wma_err("Failed to process mgmt tx completion");