qcacmn: Update cfr metadata len calculation logic

Separate the common fields of csi_cfr_header and update
the logic of calculating the cfr_metadata_len.
Move cmn header update code to single place.

CRs-Fixed: 2916901
Change-Id: I97d99df45f667f4ed3b80264b12d3d09a3bcae95

umac/cfr/dispatcher/inc/wlan_cfr_utils_api.h

@@ -247,7 +247,10 @@ struct cfr_metadata_version_5 {
 
 #endif
 
-struct csi_cfr_header {
+#define  CFR_META_DATA_LEN \
+	(sizeof(struct csi_cfr_header) - sizeof(struct cfr_header_cmn))
+
+struct cfr_header_cmn {
 	u_int32_t   start_magic_num;
 	u_int32_t   vendorid;
 	u_int8_t    cfr_metadata_version;
@@ -255,7 +258,10 @@ struct csi_cfr_header {
 	u_int8_t    chip_type;
 	u_int8_t    pltform_type;
 	u_int32_t   cfr_metadata_len;
+} __attribute__ ((__packed__));
 
+struct csi_cfr_header {
+	struct cfr_header_cmn cmn;
 	union {
 		struct cfr_metadata_version_1 meta_v1;
 		struct cfr_metadata_version_2 meta_v2;

umac/cfr/dispatcher/src/wlan_cfr_ucfg_api.c

@@ -423,12 +423,12 @@ void ucfg_cfr_capture_data(struct wlan_objmgr_psoc *psoc, uint32_t vdev_id,
 		goto exit;
 	}
 
-	hdr->vendorid               = CFR_VENDOR_ID;
-	hdr->cfr_metadata_version   = CFR_META_VERSION_1;
-	hdr->cfr_data_version       = CFR_DATA_VERSION_1;
-	hdr->chip_type              = CFR_CAPTURE_RADIO_ADRASTEA;
-	hdr->pltform_type           = CFR_PLATFORM_TYPE_ARM;
-	hdr->cfr_metadata_len       = sizeof(struct cfr_metadata_version_1);
+	hdr->cmn.vendorid               = CFR_VENDOR_ID;
+	hdr->cmn.cfr_metadata_version   = CFR_META_VERSION_1;
+	hdr->cmn.cfr_data_version       = CFR_DATA_VERSION_1;
+	hdr->cmn.chip_type              = CFR_CAPTURE_RADIO_ADRASTEA;
+	hdr->cmn.pltform_type           = CFR_PLATFORM_TYPE_ARM;
+	hdr->cmn.cfr_metadata_len       = CFR_META_DATA_LEN;
 
 	vaddr = pcfr->cfr_mem_chunk.vaddr;
 	rindex = (u32 *)vaddr;