From 81f0e970cb64a916d7147845ae8bfca841588868 Mon Sep 17 00:00:00 2001
From: Padma Raghunathan <padmar@codeaurora.org>
Date: Thu, 26 Mar 2020 12:01:07 +0530
Subject: [PATCH] qcacmn: CFR: Clean up header file inclusions in CFR

1. Remove absolute paths to cfr header file.
2. Exclusion of CFR header file is handled in Kbuild,
remove compile flag within file.

Change-Id: I6abdce56716ba17481ccc2e1942754203063e3ad
CRs-Fixed: 2649714
---
 umac/cfr/dispatcher/inc/wlan_cfr_public_structs.h | 14 ++++++--------
 umac/cfr/dispatcher/src/wlan_cfr_utils_api.c      |  4 ++--
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/umac/cfr/dispatcher/inc/wlan_cfr_public_structs.h b/umac/cfr/dispatcher/inc/wlan_cfr_public_structs.h
index 60803097a4cc..923566bc772b 100644
--- a/umac/cfr/dispatcher/inc/wlan_cfr_public_structs.h
+++ b/umac/cfr/dispatcher/inc/wlan_cfr_public_structs.h
@@ -20,8 +20,7 @@
 #ifndef _WLAN_CFR_PUBLIC_STRUCTS_H_
 #define _WLAN_CFR_PUBLIC_STRUCTS_H_
 
-#ifdef WLAN_CFR_ENABLE
-#include "qdf_types.h"
+#define MAC_ADDR_LEN 6
 
 /**
  * cfr_cwm_width : Capture bandwidth
@@ -115,12 +114,12 @@ struct cfr_wlanconfig_param {
 	enum cfr_cwm_width bandwidth;
 	uint32_t periodicity;
 	enum cfr_capture_method capture_method;
-	uint8_t mac[QDF_MAC_ADDR_SIZE];
+	uint8_t mac[MAC_ADDR_LEN];
 #ifdef WLAN_ENH_CFR_ENABLE
-	uint8_t ta[QDF_MAC_ADDR_SIZE];
-	uint8_t ra[QDF_MAC_ADDR_SIZE];
-	uint8_t ta_mask[QDF_MAC_ADDR_SIZE];
-	uint8_t ra_mask[QDF_MAC_ADDR_SIZE];
+	uint8_t ta[MAC_ADDR_LEN];
+	uint8_t ra[MAC_ADDR_LEN];
+	uint8_t ta_mask[MAC_ADDR_LEN];
+	uint8_t ra_mask[MAC_ADDR_LEN];
 	uint16_t en_directed_ftm             :1,
 		 en_directed_ndpa_ndp        :1,
 		 en_ta_ra_filter             :1,
@@ -162,6 +161,5 @@ struct cfr_wlanconfig_param {
 #endif
 };
 
-#endif /* WLAN_CFR_ENABLE */
 #endif /* _WLAN_CFR_PUBLIC_STRUCTS_H_ */
 
diff --git a/umac/cfr/dispatcher/src/wlan_cfr_utils_api.c b/umac/cfr/dispatcher/src/wlan_cfr_utils_api.c
index 4cb8ea2298e2..42fac87a8fcf 100644
--- a/umac/cfr/dispatcher/src/wlan_cfr_utils_api.c
+++ b/umac/cfr/dispatcher/src/wlan_cfr_utils_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -19,7 +19,7 @@
 #include <wlan_cfr_utils_api.h>
 #include <wlan_cfr_tgt_api.h>
 #include <qdf_module.h>
-#include "../../core/inc/cfr_defs_i.h"
+#include <cfr_defs_i.h>
 #include <wlan_objmgr_global_obj.h>
 #include <wlan_objmgr_pdev_obj.h>