qcacmn: Move mon mac filter func to mon ops structure

Monitor ops functions are different for version 1 and 2.
Move mon mac filter func ptr to mon ops structure so that
its initialized properly according to monitor version.

Change-Id: Ie07ae3b7d3e9923e463db503aaa8b3500c1e1eac
CRs-Fixed: 3456620

dp/inc/cdp_txrx_ctrl.h

@@ -118,11 +118,11 @@ cdp_update_mon_mac_filter(ol_txrx_soc_handle soc,
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	if (!soc->ops->ctrl_ops ||
-	    !soc->ops->ctrl_ops->txrx_update_mon_mac_filter)
+	if (!soc->ops->mon_ops ||
+	    !soc->ops->mon_ops->txrx_update_mon_mac_filter)
 		return QDF_STATUS_E_FAILURE;
 
-	return soc->ops->ctrl_ops->txrx_update_mon_mac_filter
+	return soc->ops->mon_ops->txrx_update_mon_mac_filter
 			(soc, vdev_id, cmd);
 }
 

dp/inc/cdp_txrx_ops.h

@@ -952,9 +952,6 @@ struct cdp_ctrl_ops {
 						     uint32_t *mask,
 						     uint32_t *mask_cont);
 #endif
-	QDF_STATUS (*txrx_update_mon_mac_filter)(struct cdp_soc_t *soc,
-						 uint8_t vdev_id,
-						 uint32_t cmd);
 };
 
 struct cdp_me_ops {
@@ -995,6 +992,7 @@ struct cdp_me_ops {
  * @txrx_update_pdev_mon_telemetry_airtime_stats: update telemetry airtime
  *                                                stats in monitor pdev
  * @txrx_cfr_filter: Handler to configure host rx monitor status ring
+ * @txrx_update_mon_mac_filter: Handler to configure mon mac filter
  */
 struct cdp_mon_ops {
 
@@ -1099,6 +1097,10 @@ struct cdp_mon_ops {
 				struct cdp_monitor_filter *filter_val,
 				bool cfr_enable_monitor_mode);
 #endif
+
+	QDF_STATUS (*txrx_update_mon_mac_filter)(struct cdp_soc_t *soc,
+						 uint8_t vdev_id,
+						 uint32_t cmd);
 };
 
 /**

dp/wifi3.0/monitor/2.0/dp_mon_2.0.c

@@ -1694,6 +1694,7 @@ struct cdp_mon_ops dp_ops_mon_2_0 = {
 	.txrx_update_pdev_mon_telemetry_airtime_stats =
 			dp_pdev_update_telemetry_airtime_stats,
 #endif
+	.txrx_update_mon_mac_filter = NULL,
 };
 
 #ifdef QCA_MONITOR_OPS_PER_SOC_SUPPORT

dp/wifi3.0/monitor/dp_mon.c

@@ -6248,7 +6248,7 @@ void dp_mon_cdp_ops_register(struct dp_soc *soc)
 #endif
 		if (target_type == TARGET_TYPE_QCN9000 ||
 		    target_type == TARGET_TYPE_QCN9160)
-			ops->ctrl_ops->txrx_update_mon_mac_filter =
+			ops->mon_ops->txrx_update_mon_mac_filter =
 					dp_update_mon_mac_filter;
 		break;
 	case TARGET_TYPE_QCN9224: