qcacmn: Change data type of modified_in_curr_session

Repetitive channel capture configurations usually support
16 groups to be confugured. To check if a particular group
is enabled by user, qdf_test_bit is being used here.

qdf_test_bit usually operates with uint32_t and it takes
the argument as unsigned long type. Since,
modified_in_curr_session is declared as uint16_t, and then
typecasted into unsigned long.

Change the data type of modified_in_curr_session
from uint16_t to 'unsigned long' to avoid compiler
issues.

Change-Id: Iec778dc36d5671f2cfb643c9ced1bd2a6104de2b
CRs-Fixed: 2753267

target_if/cfr/src/target_if_cfr_enh.c

@@ -1598,15 +1598,13 @@ void target_if_cfr_update_global_cfg(struct wlan_objmgr_pdev *pdev)
 	struct pdev_cfr *pcfr;
 	struct ta_ra_cfr_cfg *curr_cfg = NULL;
 	struct ta_ra_cfr_cfg *glbl_cfg = NULL;
-	unsigned long *modified_in_this_session;
 
 	pcfr = wlan_objmgr_pdev_get_comp_private_obj(pdev,
 						     WLAN_UMAC_COMP_CFR);
-	modified_in_this_session =
-		(unsigned long *)&pcfr->rcc_param.modified_in_curr_session;
 
 	for (grp_id = 0; grp_id < MAX_TA_RA_ENTRIES; grp_id++) {
-		if (qdf_test_bit(grp_id, modified_in_this_session)) {
+		if (qdf_test_bit(grp_id,
+				 &pcfr->rcc_param.modified_in_curr_session)) {
 			/* Populating global config based on user's input */
 			glbl_cfg = &pcfr->global[grp_id];
 			curr_cfg = &pcfr->rcc_param.curr[grp_id];

umac/cfr/dispatcher/inc/wlan_cfr_utils_api.h

@@ -444,7 +444,7 @@ struct cfr_rcc_param {
 	uint8_t num_grp_tlvs;
 
 	struct ta_ra_cfr_cfg curr[MAX_TA_RA_ENTRIES];
-	uint16_t modified_in_curr_session;
+	unsigned long modified_in_curr_session;
 	uint32_t capture_count            :16,
 		 capture_intval_mode_sel  :1,
 		 rsvd2                    :15;
@@ -626,7 +626,7 @@ QDF_STATUS wlan_cfr_pdev_close(struct wlan_objmgr_pdev *pdev);
  *
  * Return: No. of set bits
  */
-uint8_t count_set_bits(uint32_t value);
+uint8_t count_set_bits(unsigned long value);
 
 /**
  * wlan_cfr_is_feature_disabled() - Check if cfr feature is disabled

umac/cfr/dispatcher/src/wlan_cfr_ucfg_api.c

@@ -774,7 +774,7 @@ ucfg_cfr_set_capture_duration(struct wlan_objmgr_vdev *vdev,
  * Copy user provided group parameters( type/ subtype of mgmt, ctrl, data )
  * into curr_cfg instance of ta_ra_cfr_cfg.
  * Set valid mask for the provided configuration.
- * Set modified_in_this_session for the particular group.
+ * Set modified_in_curr_session for the particular group.
  */
 
 QDF_STATUS
@@ -801,7 +801,6 @@ ucfg_cfr_set_frame_type_subtype(struct wlan_objmgr_vdev *vdev,
 	curr_cfg->valid_data_subtype = 1;
 
 	qdf_set_bit(params->grp_id,
-		    (unsigned long *)
 		    &pcfr->rcc_param.modified_in_curr_session);
 
 	wlan_objmgr_pdev_release_ref(pdev, WLAN_CFR_ID);
@@ -813,7 +812,7 @@ ucfg_cfr_set_frame_type_subtype(struct wlan_objmgr_vdev *vdev,
  * Copy user provided group parameters( BW and NSS )
  * into curr_cfg instance of ta_ra_cfr_cfg.
  * Set valid mask for the provided configuration.
- * Set modified_in_this_session for the particular group.
+ * Set modified_in_curr_session for the particular group.
  */
 
 QDF_STATUS ucfg_cfr_set_bw_nss(struct wlan_objmgr_vdev *vdev,
@@ -837,7 +836,7 @@ QDF_STATUS ucfg_cfr_set_bw_nss(struct wlan_objmgr_vdev *vdev,
 	curr_cfg->valid_nss_mask = 1;
 
 	qdf_set_bit(params->grp_id,
-		    (unsigned long *)&pcfr->rcc_param.modified_in_curr_session);
+		    &pcfr->rcc_param.modified_in_curr_session);
 
 	wlan_objmgr_pdev_release_ref(pdev, WLAN_CFR_ID);
 
@@ -848,7 +847,7 @@ QDF_STATUS ucfg_cfr_set_bw_nss(struct wlan_objmgr_vdev *vdev,
  * Copy user provided group parameters( TA, RA, TA_MASK, RA_MASK )
  * into curr_cfg instance of ta_ra_cfr_cfg.
  * Set valid mask for the provided configuration.
- * Set modified_in_this_session for the particular group.
+ * Set modified_in_curr_session for the particular group.
  */
 
 QDF_STATUS ucfg_cfr_set_tara_config(struct wlan_objmgr_vdev *vdev,
@@ -877,7 +876,6 @@ QDF_STATUS ucfg_cfr_set_tara_config(struct wlan_objmgr_vdev *vdev,
 	curr_cfg->valid_ra_mask = 1;
 
 	qdf_set_bit(params->grp_id,
-		    (unsigned long *)
 		    &pcfr->rcc_param.modified_in_curr_session);
 
 	wlan_objmgr_pdev_release_ref(pdev, WLAN_CFR_ID);
@@ -942,7 +940,7 @@ QDF_STATUS ucfg_cfr_get_cfg(struct wlan_objmgr_vdev *vdev)
 		pcfr->rcc_param.freeze_tlv_delay_cnt_thr);
 	cfr_err("Enabled CFG id bitmap : 0x%x\n",
 		pcfr->rcc_param.filter_group_bitmap);
-	cfr_err(" Modified cfg id bitmap : 0x%x\n",
+	cfr_err(" Modified cfg id bitmap : %lu\n",
 		pcfr->rcc_param.modified_in_curr_session);
 
 	cfr_err("TARA_CONFIG details:\n");
@@ -1195,7 +1193,7 @@ static void cfr_set_filter(struct wlan_objmgr_pdev *pdev, bool enable,
  * called glbl_cfg and update the current config to default state for the
  * next commit session.
  *
- * Finally, reset the counter (modified_in_this_session) to 0 before moving to
+ * Finally, reset the counter (modified_in_curr_session) to 0 before moving to
  * next commit session.
  *
  */

umac/cfr/dispatcher/src/wlan_cfr_utils_api.c

@@ -179,7 +179,7 @@ QDF_STATUS cfr_deinitialize_pdev(struct wlan_objmgr_pdev *pdev)
 }
 qdf_export_symbol(cfr_deinitialize_pdev);
 
-uint8_t count_set_bits(uint32_t value)
+uint8_t count_set_bits(unsigned long value)
 {
 	uint8_t count = 0;
 

wmi/src/wmi_unified_cfr_tlv.c

@@ -200,7 +200,6 @@ static QDF_STATUS send_cfr_rcc_cmd_tlv(wmi_unified_t wmi_handle,
 
 		for (grp_id = 0; grp_id < MAX_TA_RA_ENTRIES; grp_id++) {
 			if (qdf_test_bit(grp_id,
-					 (unsigned long *)
 					 &rcc->modified_in_curr_session)) {
 				populate_wmi_cfr_param(grp_id, rcc, param);
 				param++;