Revert "qcacld-3.0: Store events in pktlog buffer when Pktlog is enabled by default in INI"

This reverts commit Id0b7dd6b4573147eef9b80b57bc78284e52807ec.

This change is not required anymore as now vendor related pktlog
enable/disable command will be handled via flag in wifi start log
structure.

Change-Id: I82f32d3d8021361e92d67a53624a1d5d027fd9b8
CRs-Fixed: 1072584

3 files changed, 3 insertions, 22 deletions

diff --git a/core/utils/pktlog/include/pktlog_ac.h b/core/utils/pktlog/include/pktlog_ac.h
index cd45f6987aae..9d213e0c76bb 100644
--- a/core/utils/pktlog/include/pktlog_ac.h
+++ b/core/utils/pktlog/include/pktlog_ac.h
@@ -104,7 +104,6 @@ struct ol_pktlog_dev_t {
 	uint32_t htc_err_cnt;
 	uint8_t htc_endpoint;
 	void *htc_pdev;
-	bool enable_flag;
 };
 
 #define PKTLOG_SYSCTL_SIZE      14
diff --git a/core/utils/pktlog/linux_ac.c b/core/utils/pktlog/linux_ac.c
index c312b5903487..b92de81f683d 100644
--- a/core/utils/pktlog/linux_ac.c
+++ b/core/utils/pktlog/linux_ac.c
@@ -230,13 +230,9 @@ qdf_sysctl_decl(ath_sysctl_pktlog_enable, ctl, write, filp, buffer, lenp, ppos)
 		ret = QDF_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer,
 					       lenp, ppos);
 		if (ret == 0)
-			/*
-			 * enable/disable pktlog through sysfs should be counted
-			 * as user_triggered = 1.
-			 */
 			ret = pl_dev->pl_funcs->pktlog_enable(
 					(struct hif_opaque_softc *)scn, enable,
-						cds_is_packet_log_enabled(), 1);
+						cds_is_packet_log_enabled(), 0);
 		else
 			printk(PKTLOG_TAG "%s:proc_dointvec failed\n",
 			       __func__);
@@ -444,7 +440,6 @@ static int pktlog_attach(struct hif_opaque_softc *scn)
 	 * might be good to move to pktlog_init
 	 */
 	/* pl_dev->tgt_pktlog_alloced = false; */
-	pl_dev->enable_flag = false;
 	pl_info_lnx->proc_entry = NULL;
 	pl_info_lnx->sysctl_header = NULL;
 
@@ -514,7 +509,7 @@ static void pktlog_detach(struct hif_opaque_softc *scn)
 		ASSERT(0);
 		return;
 	}
-	pl_dev->enable_flag = false;
+
 	pl_info = pl_dev->pl_info;
 	remove_proc_entry(WLANDEV_BASENAME, g_pktlog_pde);
 	pktlog_sysctl_unregister(pl_dev);
diff --git a/core/utils/pktlog/pktlog_ac.c b/core/utils/pktlog/pktlog_ac.c
index d3055e134485..db6284871bc4 100644
--- a/core/utils/pktlog/pktlog_ac.c
+++ b/core/utils/pktlog/pktlog_ac.c
@@ -311,7 +311,6 @@ int pktlog_disable(struct hif_opaque_softc *scn)
 		return -EFAULT;
 
 	pl_dev = txrx_pdev->pl_dev;
-	pl_dev->enable_flag = false;
 	pl_info = pl_dev->pl_info;
 
 	if (pktlog_wma_post_msg(0, WMI_PDEV_PKTLOG_DISABLE_CMDID, 0, 0)) {
@@ -356,7 +355,6 @@ void pktlog_init(struct hif_opaque_softc *scn)
 	pl_info->pktlen = 0;
 	pl_info->start_time_thruput = 0;
 	pl_info->start_time_per = 0;
-	pdev_txrx_handle->pl_dev->enable_flag = false;
 
 	PKTLOG_TX_SUBSCRIBER.callback = pktlog_callback;
 	PKTLOG_RX_SUBSCRIBER.callback = pktlog_callback;
@@ -398,17 +396,6 @@ int pktlog_enable(struct hif_opaque_softc *scn, int32_t log_state,
 
 	if (!pl_info)
 		return 0;
-	/*
-	 * Do not send the pktlog disable command in case when pktlog
-	 * is enabled from INI during init, SO make enable_flag as false.
-	 * send the pktlog disable command only after when user will triggere
-	 * iwpriv pktlog enable command or enable through pktlog conf tool or
-	 * vendor will send pktlog enable command.
-	 */
-	if (ini_triggered == 1 && user_triggered == 0 && log_state != 0)
-		pl_dev->enable_flag = false;
-	else if (log_state != 0)
-		pl_dev->enable_flag = true;
 
 	if (!pl_dev->tgt_pktlog_alloced) {
 		if (pl_info->buf == NULL) {
@@ -455,7 +442,7 @@ int pktlog_enable(struct hif_opaque_softc *scn, int32_t log_state,
 			printk("Device cannot be enabled, %s\n", __func__);
 			return -1;
 		}
-	} else if (pl_dev->enable_flag) {
+	} else {
 		pl_dev->pl_funcs->pktlog_disable(scn);
 	}