diff --git a/Kbuild b/Kbuild
index 507ff0e..01f5e8e 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1949,121 +1949,121 @@
 
 ccflags-y += $(INCS)
 
-ccflags-y +=	-DANI_OS_TYPE_ANDROID=6 \
+cppflags-y +=	-DANI_OS_TYPE_ANDROID=6 \
 		-Wall\
 		-Werror\
 		-D__linux__
 
-ccflags-$(CONFIG_PTT_SOCK_SVC_ENABLE) += -DPTT_SOCK_SVC_ENABLE
-ccflags-$(CONFIG_FEATURE_WLAN_WAPI) += -DFEATURE_WLAN_WAPI
-ccflags-$(CONFIG_FEATURE_WLAN_WAPI) += -DATH_SUPPORT_WAPI
-ccflags-$(CONFIG_AGEIE_ON_SCAN_RESULTS) += -DWLAN_ENABLE_AGEIE_ON_SCAN_RESULTS
-ccflags-$(CONFIG_SOFTAP_CHANNEL_RANGE) += -DSOFTAP_CHANNEL_RANGE
-ccflags-$(CONFIG_FEATURE_WLAN_SCAN_PNO) += -DFEATURE_WLAN_SCAN_PNO
-ccflags-$(CONFIG_WLAN_FEATURE_PACKET_FILTERING) += -DWLAN_FEATURE_PACKET_FILTERING
-ccflags-$(CONFIG_WLAN_NS_OFFLOAD) += -DWLAN_NS_OFFLOAD
-ccflags-$(CONFIG_FEATURE_WLAN_RA_FILTERING) += -DFEATURE_WLAN_RA_FILTERING
-ccflags-$(CONFIG_FEATURE_WLAN_LPHB) += -DFEATURE_WLAN_LPHB
-ccflags-$(CONFIG_QCA_SUPPORT_TX_THROTTLE) += -DQCA_SUPPORT_TX_THROTTLE
-ccflags-$(CONFIG_WMI_INTERFACE_EVENT_LOGGING) += -DWMI_INTERFACE_EVENT_LOGGING
-ccflags-$(CONFIG_WLAN_FEATURE_LINK_LAYER_STATS) += -DWLAN_FEATURE_LINK_LAYER_STATS
-ccflags-$(CONFIG_FEATURE_WLAN_EXTSCAN) += -DFEATURE_WLAN_EXTSCAN
-ccflags-$(CONFIG_160MHZ_SUPPORT) += -DCONFIG_160MHZ_SUPPORT
-ccflags-$(CONFIG_MCL) += -DCONFIG_MCL
-ccflags-$(CONFIG_MCL_REGDB) += -DCONFIG_MCL_REGDB
-ccflags-$(CONFIG_LEGACY_CHAN_ENUM) += -DCONFIG_LEGACY_CHAN_ENUM
-ccflags-$(CONFIG_NAPIER_SCAN) += -DNAPIER_SCAN
-ccflags-$(CONFIG_WLAN_PMO_ENABLE) += -DWLAN_PMO_ENABLE
-ccflags-$(CONFIG_CONVERGED_P2P_ENABLE) += -DCONVERGED_P2P_ENABLE
-ccflags-$(CONFIG_WLAN_POLICY_MGR_ENABLE) += -DWLAN_POLICY_MGR_ENABLE
-ccflags-$(CONFIG_SUPPORT_11AX) += -DSUPPORT_11AX
-ccflags-$(CONFIG_HDD_INIT_WITH_RTNL_LOCK) += -DCONFIG_HDD_INIT_WITH_RTNL_LOCK
-ccflags-$(CONFIG_CONVERGED_TDLS_ENABLE) += -DCONVERGED_TDLS_ENABLE
-ccflags-$(CONFIG_WLAN_CONV_SPECTRAL_ENABLE) += -DWLAN_CONV_SPECTRAL_ENABLE
-ccflags-$(CONFIG_WLAN_SPECTRAL_ENABLE) += -DWLAN_SPECTRAL_ENABLE
-ccflags-$(CONFIG_WMI_CMD_STRINGS) += -DWMI_CMD_STRINGS
+cppflags-$(CONFIG_PTT_SOCK_SVC_ENABLE) += -DPTT_SOCK_SVC_ENABLE
+cppflags-$(CONFIG_FEATURE_WLAN_WAPI) += -DFEATURE_WLAN_WAPI
+cppflags-$(CONFIG_FEATURE_WLAN_WAPI) += -DATH_SUPPORT_WAPI
+cppflags-$(CONFIG_AGEIE_ON_SCAN_RESULTS) += -DWLAN_ENABLE_AGEIE_ON_SCAN_RESULTS
+cppflags-$(CONFIG_SOFTAP_CHANNEL_RANGE) += -DSOFTAP_CHANNEL_RANGE
+cppflags-$(CONFIG_FEATURE_WLAN_SCAN_PNO) += -DFEATURE_WLAN_SCAN_PNO
+cppflags-$(CONFIG_WLAN_FEATURE_PACKET_FILTERING) += -DWLAN_FEATURE_PACKET_FILTERING
+cppflags-$(CONFIG_WLAN_NS_OFFLOAD) += -DWLAN_NS_OFFLOAD
+cppflags-$(CONFIG_FEATURE_WLAN_RA_FILTERING) += -DFEATURE_WLAN_RA_FILTERING
+cppflags-$(CONFIG_FEATURE_WLAN_LPHB) += -DFEATURE_WLAN_LPHB
+cppflags-$(CONFIG_QCA_SUPPORT_TX_THROTTLE) += -DQCA_SUPPORT_TX_THROTTLE
+cppflags-$(CONFIG_WMI_INTERFACE_EVENT_LOGGING) += -DWMI_INTERFACE_EVENT_LOGGING
+cppflags-$(CONFIG_WLAN_FEATURE_LINK_LAYER_STATS) += -DWLAN_FEATURE_LINK_LAYER_STATS
+cppflags-$(CONFIG_FEATURE_WLAN_EXTSCAN) += -DFEATURE_WLAN_EXTSCAN
+cppflags-$(CONFIG_160MHZ_SUPPORT) += -DCONFIG_160MHZ_SUPPORT
+cppflags-$(CONFIG_MCL) += -DCONFIG_MCL
+cppflags-$(CONFIG_MCL_REGDB) += -DCONFIG_MCL_REGDB
+cppflags-$(CONFIG_LEGACY_CHAN_ENUM) += -DCONFIG_LEGACY_CHAN_ENUM
+cppflags-$(CONFIG_NAPIER_SCAN) += -DNAPIER_SCAN
+cppflags-$(CONFIG_WLAN_PMO_ENABLE) += -DWLAN_PMO_ENABLE
+cppflags-$(CONFIG_CONVERGED_P2P_ENABLE) += -DCONVERGED_P2P_ENABLE
+cppflags-$(CONFIG_WLAN_POLICY_MGR_ENABLE) += -DWLAN_POLICY_MGR_ENABLE
+cppflags-$(CONFIG_SUPPORT_11AX) += -DSUPPORT_11AX
+cppflags-$(CONFIG_HDD_INIT_WITH_RTNL_LOCK) += -DCONFIG_HDD_INIT_WITH_RTNL_LOCK
+cppflags-$(CONFIG_CONVERGED_TDLS_ENABLE) += -DCONVERGED_TDLS_ENABLE
+cppflags-$(CONFIG_WLAN_CONV_SPECTRAL_ENABLE) += -DWLAN_CONV_SPECTRAL_ENABLE
+cppflags-$(CONFIG_WLAN_SPECTRAL_ENABLE) += -DWLAN_SPECTRAL_ENABLE
+cppflags-$(CONFIG_WMI_CMD_STRINGS) += -DWMI_CMD_STRINGS
 
-ccflags-$(CONFIG_WLAN_DISABLE_EXPORT_SYMBOL) += -DWLAN_DISABLE_EXPORT_SYMBOL
-ccflags-$(CONFIG_WIFI_POS_CONVERGED) += -DWIFI_POS_CONVERGED
-ccflags-$(CONFIG_WIFI_POS_LEGACY) += -DFEATURE_OEM_DATA_SUPPORT
-ccflags-$(CONFIG_FEATURE_HTC_CREDIT_HISTORY) += -DFEATURE_HTC_CREDIT_HISTORY
-ccflags-$(CONFIG_WLAN_FEATURE_P2P_DEBUG) += -DWLAN_FEATURE_P2P_DEBUG
-ccflags-$(CONFIG_WLAN_LOGGING_SOCK_SVC) += -DWLAN_LOGGING_SOCK_SVC_ENABLE
-ccflags-$(CONFIG_WLAN_FEATURE_FILS) += -DWLAN_FEATURE_FILS_SK
+cppflags-$(CONFIG_WLAN_DISABLE_EXPORT_SYMBOL) += -DWLAN_DISABLE_EXPORT_SYMBOL
+cppflags-$(CONFIG_WIFI_POS_CONVERGED) += -DWIFI_POS_CONVERGED
+cppflags-$(CONFIG_WIFI_POS_LEGACY) += -DFEATURE_OEM_DATA_SUPPORT
+cppflags-$(CONFIG_FEATURE_HTC_CREDIT_HISTORY) += -DFEATURE_HTC_CREDIT_HISTORY
+cppflags-$(CONFIG_WLAN_FEATURE_P2P_DEBUG) += -DWLAN_FEATURE_P2P_DEBUG
+cppflags-$(CONFIG_WLAN_LOGGING_SOCK_SVC) += -DWLAN_LOGGING_SOCK_SVC_ENABLE
+cppflags-$(CONFIG_WLAN_FEATURE_FILS) += -DWLAN_FEATURE_FILS_SK
 
 ifeq ($(CONFIG_CNSS), y)
 ifeq ($(CONFIG_CNSS_SDIO), y)
-ccflags-y += -DCONFIG_PLD_SDIO_CNSS
+cppflags-y += -DCONFIG_PLD_SDIO_CNSS
 else
-ccflags-y += -DCONFIG_PLD_PCIE_CNSS
+cppflags-y += -DCONFIG_PLD_PCIE_CNSS
 endif
 endif
 
 ifeq ($(CONFIG_CNSS2), y)
-ccflags-y += -DCONFIG_PLD_PCIE_CNSS
-ccflags-y += -DCONFIG_PLD_PCIE_INIT
+cppflags-y += -DCONFIG_PLD_PCIE_CNSS
+cppflags-y += -DCONFIG_PLD_PCIE_INIT
 endif
 
 #Enable NL80211 test mode
-ccflags-$(CONFIG_NL80211_TESTMODE) += -DWLAN_NL80211_TESTMODE
+cppflags-$(CONFIG_NL80211_TESTMODE) += -DWLAN_NL80211_TESTMODE
 
 # Flag to enable bus auto suspend
 ifeq ($(CONFIG_HIF_PCI), y)
 ifeq ($(CONFIG_BUS_AUTO_SUSPEND), y)
-ccflags-y += -DFEATURE_RUNTIME_PM
+cppflags-y += -DFEATURE_RUNTIME_PM
 endif
 endif
 
-ccflags-$(CONFIG_ICNSS) += -DCONFIG_PLD_SNOC_ICNSS
+cppflags-$(CONFIG_ICNSS) += -DCONFIG_PLD_SNOC_ICNSS
 
-ccflags-$(CONFIG_ICNSS) += -DQCA_WIFI_3_0
+cppflags-$(CONFIG_ICNSS) += -DQCA_WIFI_3_0
 
-ccflags-$(CONFIG_WIFI_3_0_ADRASTEA) += -DQCA_WIFI_3_0_ADRASTEA
-ccflags-$(CONFIG_ADRASTEA_SHADOW_REGISTERS) += -DADRASTEA_SHADOW_REGISTERS
-ccflags-$(CONFIG_ADRASTEA_RRI_ON_DDR) += -DADRASTEA_RRI_ON_DDR
+cppflags-$(CONFIG_WIFI_3_0_ADRASTEA) += -DQCA_WIFI_3_0_ADRASTEA
+cppflags-$(CONFIG_ADRASTEA_SHADOW_REGISTERS) += -DADRASTEA_SHADOW_REGISTERS
+cppflags-$(CONFIG_ADRASTEA_RRI_ON_DDR) += -DADRASTEA_RRI_ON_DDR
 
 ifeq ($(CONFIG_QMI_SUPPORT), n)
-ccflags-y += -DCONFIG_BYPASS_QMI
+cppflags-y += -DCONFIG_BYPASS_QMI
 endif
 
-ccflags-$(CONFIG_WLAN_FASTPATH) +=	-DWLAN_FEATURE_FASTPATH
+cppflags-$(CONFIG_WLAN_FASTPATH) +=	-DWLAN_FEATURE_FASTPATH
 
-ccflags-$(CONFIG_FEATURE_PKTLOG) +=     -DFEATURE_PKTLOG
+cppflags-$(CONFIG_FEATURE_PKTLOG) +=     -DFEATURE_PKTLOG
 
-ccflags-y +=	-DCONFIG_DP_TRACE
+cppflags-y +=	-DCONFIG_DP_TRACE
 
 ifeq ($(CONFIG_WLAN_NAPI), y)
-ccflags-y += -DFEATURE_NAPI
-ccflags-y += -DHIF_IRQ_AFFINITY
+cppflags-y += -DFEATURE_NAPI
+cppflags-y += -DHIF_IRQ_AFFINITY
 ifeq ($(CONFIG_WLAN_NAPI_DEBUG), y)
-ccflags-y += -DFEATURE_NAPI_DEBUG
+cppflags-y += -DFEATURE_NAPI_DEBUG
 endif
 endif
 
 ifeq (y,$(findstring y,$(CONFIG_ARCH_MSM) $(CONFIG_ARCH_QCOM)))
-ccflags-y += -DMSM_PLATFORM
+cppflags-y += -DMSM_PLATFORM
 endif
 
-ccflags-y +=	-DQCA_SUPPORT_TXRX_LOCAL_PEER_ID
+cppflags-y +=	-DQCA_SUPPORT_TXRX_LOCAL_PEER_ID
 
-ccflags-$(CONFIG_WLAN_TX_FLOW_CONTROL_V2) += -DQCA_LL_TX_FLOW_CONTROL_V2
-ccflags-$(CONFIG_WLAN_TX_FLOW_CONTROL_V2) += -DQCA_LL_TX_FLOW_GLOBAL_MGMT_POOL
-ccflags-$(CONFIG_WLAN_TX_FLOW_CONTROL_LEGACY) += -DQCA_LL_LEGACY_TX_FLOW_CONTROL
+cppflags-$(CONFIG_WLAN_TX_FLOW_CONTROL_V2) += -DQCA_LL_TX_FLOW_CONTROL_V2
+cppflags-$(CONFIG_WLAN_TX_FLOW_CONTROL_V2) += -DQCA_LL_TX_FLOW_GLOBAL_MGMT_POOL
+cppflags-$(CONFIG_WLAN_TX_FLOW_CONTROL_LEGACY) += -DQCA_LL_LEGACY_TX_FLOW_CONTROL
 
 ifeq ($(BUILD_DEBUG_VERSION), y)
-ccflags-y +=	-DWLAN_DEBUG
+cppflags-y +=	-DWLAN_DEBUG
 ifeq ($(CONFIG_TRACE_RECORD_FEATURE), y)
-ccflags-y +=	-DTRACE_RECORD \
+cppflags-y +=	-DTRACE_RECORD \
 		-DLIM_TRACE_RECORD \
 		-DSME_TRACE_RECORD \
 		-DHDD_TRACE_RECORD
 endif
 endif
-ccflags-$(CONFIG_WLAN_DEBUG_CRASH_INJECT) += -DCONFIG_WLAN_DEBUG_CRASH_INJECT
-ccflags-$(CONFIG_FEATURE_UNIT_TEST_SUSPEND) += -DWLAN_SUSPEND_RESUME_TEST
+cppflags-$(CONFIG_WLAN_DEBUG_CRASH_INJECT) += -DCONFIG_WLAN_DEBUG_CRASH_INJECT
+cppflags-$(CONFIG_FEATURE_UNIT_TEST_SUSPEND) += -DWLAN_SUSPEND_RESUME_TEST
 
 ifeq ($(CONFIG_LEAK_DETECTION), y)
-ccflags-y += \
+cppflags-y += \
 	-DCONFIG_HALT_KMEMLEAK \
 	-DCONFIG_LEAK_DETECTION \
 	-DMEMORY_DEBUG \
@@ -2071,98 +2071,98 @@
 	-DTIMER_MANAGER
 endif
 
-ccflags-y += -DWLAN_FEATURE_P2P
-ccflags-y += -DWLAN_FEATURE_WFD
+cppflags-y += -DWLAN_FEATURE_P2P
+cppflags-y += -DWLAN_FEATURE_WFD
 ifeq ($(CONFIG_QCOM_VOWIFI_11R), y)
-ccflags-y += -DKERNEL_SUPPORT_11R_CFG80211
-ccflags-y += -DUSE_80211_WMMTSPEC_FOR_RIC
+cppflags-y += -DKERNEL_SUPPORT_11R_CFG80211
+cppflags-y += -DUSE_80211_WMMTSPEC_FOR_RIC
 endif
 
 ifeq ($(CONFIG_QCOM_ESE), y)
-ccflags-y += -DFEATURE_WLAN_ESE
-ccflags-y += -DQCA_COMPUTE_TX_DELAY
-ccflags-y += -DQCA_COMPUTE_TX_DELAY_PER_TID
+cppflags-y += -DFEATURE_WLAN_ESE
+cppflags-y += -DQCA_COMPUTE_TX_DELAY
+cppflags-y += -DQCA_COMPUTE_TX_DELAY_PER_TID
 endif
 
 #normally, TDLS negative behavior is not needed
-ccflags-$(CONFIG_QCOM_TDLS) += -DFEATURE_WLAN_TDLS
+cppflags-$(CONFIG_QCOM_TDLS) += -DFEATURE_WLAN_TDLS
 
-ccflags-$(CONFIG_QCACLD_WLAN_LFR3) += -DWLAN_FEATURE_ROAM_OFFLOAD
+cppflags-$(CONFIG_QCACLD_WLAN_LFR3) += -DWLAN_FEATURE_ROAM_OFFLOAD
 
-ccflags-$(CONFIG_CNSS_GENL) += -DCNSS_GENL
+cppflags-$(CONFIG_CNSS_GENL) += -DCNSS_GENL
 
-ccflags-$(CONFIG_QCACLD_WLAN_LFR2) += -DWLAN_FEATURE_HOST_ROAM
+cppflags-$(CONFIG_QCACLD_WLAN_LFR2) += -DWLAN_FEATURE_HOST_ROAM
 
-ccflags-$(CONFIG_WLAN_POWER_DEBUGFS) += -DWLAN_POWER_DEBUGFS
+cppflags-$(CONFIG_WLAN_POWER_DEBUGFS) += -DWLAN_POWER_DEBUGFS
 
 # Enable object manager reference count debug infrastructure
-ccflags-$(CONFIG_WLAN_OBJMGR_DEBUG) += -DWLAN_OBJMGR_DEBUG
+cppflags-$(CONFIG_WLAN_OBJMGR_DEBUG) += -DWLAN_OBJMGR_DEBUG
 
-ccflags-$(CONFIG_WLAN_FEATURE_SAE) += -DWLAN_FEATURE_SAE
+cppflags-$(CONFIG_WLAN_FEATURE_SAE) += -DWLAN_FEATURE_SAE
 
 ifeq ($(BUILD_DIAG_VERSION), y)
-ccflags-y += -DFEATURE_WLAN_DIAG_SUPPORT
-ccflags-y += -DFEATURE_WLAN_DIAG_SUPPORT_CSR
-ccflags-y += -DFEATURE_WLAN_DIAG_SUPPORT_LIM
+cppflags-y += -DFEATURE_WLAN_DIAG_SUPPORT
+cppflags-y += -DFEATURE_WLAN_DIAG_SUPPORT_CSR
+cppflags-y += -DFEATURE_WLAN_DIAG_SUPPORT_LIM
 ifeq ($(CONFIG_HIF_PCI), y)
-ccflags-y += -DCONFIG_ATH_PROCFS_DIAG_SUPPORT
+cppflags-y += -DCONFIG_ATH_PROCFS_DIAG_SUPPORT
 endif
 endif
 
 ifeq ($(CONFIG_HIF_USB), y)
-ccflags-y += -DCONFIG_ATH_PROCFS_DIAG_SUPPORT
-ccflags-y += -DQCA_SUPPORT_OL_RX_REORDER_TIMEOUT
-ccflags-y += -DCONFIG_ATH_PCIE_MAX_PERF=0 -DCONFIG_ATH_PCIE_AWAKE_WHILE_DRIVER_LOAD=0 -DCONFIG_DISABLE_CDC_MAX_PERF_WAR=0
+cppflags-y += -DCONFIG_ATH_PROCFS_DIAG_SUPPORT
+cppflags-y += -DQCA_SUPPORT_OL_RX_REORDER_TIMEOUT
+cppflags-y += -DCONFIG_ATH_PCIE_MAX_PERF=0 -DCONFIG_ATH_PCIE_AWAKE_WHILE_DRIVER_LOAD=0 -DCONFIG_DISABLE_CDC_MAX_PERF_WAR=0
 endif
 
-ccflags-$(CONFIG_WLAN_FEATURE_11W) += -DWLAN_FEATURE_11W
+cppflags-$(CONFIG_WLAN_FEATURE_11W) += -DWLAN_FEATURE_11W
 
-ccflags-$(CONFIG_QCA_TXDESC_SANITY_CHECKS) += -DQCA_SUPPORT_TXDESC_SANITY_CHECKS
+cppflags-$(CONFIG_QCA_TXDESC_SANITY_CHECKS) += -DQCA_SUPPORT_TXDESC_SANITY_CHECKS
 
-ccflags-$(CONFIG_QCOM_LTE_COEX) += -DFEATURE_WLAN_CH_AVOID
+cppflags-$(CONFIG_QCOM_LTE_COEX) += -DFEATURE_WLAN_CH_AVOID
 
-ccflags-$(CONFIG_WLAN_FEATURE_LPSS) += -DWLAN_FEATURE_LPSS
+cppflags-$(CONFIG_WLAN_FEATURE_LPSS) += -DWLAN_FEATURE_LPSS
 
 ifneq ($(TARGET_BUILD_VARIANT),user)
-ccflags-y += -DDESC_DUP_DETECT_DEBUG
-ccflags-y += -DDEBUG_RX_RING_BUFFER
+cppflags-y += -DDESC_DUP_DETECT_DEBUG
+cppflags-y += -DDEBUG_RX_RING_BUFFER
 endif
 
-ccflags-$(PANIC_ON_BUG) += -DPANIC_ON_BUG
+cppflags-$(PANIC_ON_BUG) += -DPANIC_ON_BUG
 
-ccflags-$(WLAN_WARN_ON_ASSERT) += -DWLAN_WARN_ON_ASSERT
+cppflags-$(WLAN_WARN_ON_ASSERT) += -DWLAN_WARN_ON_ASSERT
 
-ccflags-$(CONFIG_WLAN_LOG_FATAL) += -DWLAN_LOG_FATAL
-ccflags-$(CONFIG_WLAN_LOG_ERROR) += -DWLAN_LOG_ERROR
-ccflags-$(CONFIG_WLAN_LOG_WARN) += -DWLAN_LOG_WARN
-ccflags-$(CONFIG_WLAN_LOG_INFO) += -DWLAN_LOG_INFO
-ccflags-$(CONFIG_WLAN_LOG_DEBUG) += -DWLAN_LOG_DEBUG
+cppflags-$(CONFIG_WLAN_LOG_FATAL) += -DWLAN_LOG_FATAL
+cppflags-$(CONFIG_WLAN_LOG_ERROR) += -DWLAN_LOG_ERROR
+cppflags-$(CONFIG_WLAN_LOG_WARN) += -DWLAN_LOG_WARN
+cppflags-$(CONFIG_WLAN_LOG_INFO) += -DWLAN_LOG_INFO
+cppflags-$(CONFIG_WLAN_LOG_DEBUG) += -DWLAN_LOG_DEBUG
 
-ccflags-$(WLAN_OPEN_SOURCE) += -DWLAN_OPEN_SOURCE
+cppflags-$(WLAN_OPEN_SOURCE) += -DWLAN_OPEN_SOURCE
 
-ccflags-$(CONFIG_FEATURE_STATS_EXT) += -DWLAN_FEATURE_STATS_EXT
+cppflags-$(CONFIG_FEATURE_STATS_EXT) += -DWLAN_FEATURE_STATS_EXT
 
-ccflags-$(CONFIG_QCACLD_FEATURE_NAN) += -DWLAN_FEATURE_NAN
+cppflags-$(CONFIG_QCACLD_FEATURE_NAN) += -DWLAN_FEATURE_NAN
 
-ccflags-$(CONFIG_QCA_IBSS_SUPPORT) += -DQCA_IBSS_SUPPORT
+cppflags-$(CONFIG_QCA_IBSS_SUPPORT) += -DQCA_IBSS_SUPPORT
 
 #Enable OL debug and wmi unified functions
-ccflags-$(CONFIG_ATH_PERF_PWR_OFFLOAD) += -DATH_PERF_PWR_OFFLOAD
+cppflags-$(CONFIG_ATH_PERF_PWR_OFFLOAD) += -DATH_PERF_PWR_OFFLOAD
 
 #Disable packet log
-ccflags-$(CONFIG_REMOVE_PKT_LOG) += -DREMOVE_PKT_LOG
+cppflags-$(CONFIG_REMOVE_PKT_LOG) += -DREMOVE_PKT_LOG
 
 #Enable 11AC TX
-ccflags-$(CONFIG_ATH_11AC_TXCOMPACT) += -DATH_11AC_TXCOMPACT
+cppflags-$(CONFIG_ATH_11AC_TXCOMPACT) += -DATH_11AC_TXCOMPACT
 
 #Enable PCI specific APIS (dma, etc)
-ccflags-$(CONFIG_HIF_PCI) += -DHIF_PCI
+cppflags-$(CONFIG_HIF_PCI) += -DHIF_PCI
 
-ccflags-$(CONFIG_HIF_SNOC) += -DHIF_SNOC
+cppflags-$(CONFIG_HIF_SNOC) += -DHIF_SNOC
 
 #Enable High Latency related Flags
 ifeq ($(CONFIG_QCA_WIFI_SDIO), y)
-ccflags-y += -DCONFIG_HL_SUPPORT \
+cppflags-y += -DCONFIG_HL_SUPPORT \
             -DCONFIG_AR6320_SUPPORT \
             -DSDIO_3_0 \
             -DHIF_SDIO \
@@ -2179,226 +2179,228 @@
 endif
 
 ifeq ($(CONFIG_WLAN_FEATURE_DSRC), y)
-ccflags-y += -DWLAN_FEATURE_DSRC
+cppflags-y += -DWLAN_FEATURE_DSRC
 
 ifeq ($(CONFIG_OCB_UT_FRAMEWORK), y)
-ccflags-y += -DWLAN_OCB_UT
+cppflags-y += -DWLAN_OCB_UT
 endif
 
 endif
 
-ccflags-$(CONFIG_FEATURE_SKB_PRE_ALLOC) += -DFEATURE_SKB_PRE_ALLOC
+cppflags-$(CONFIG_FEATURE_SKB_PRE_ALLOC) += -DFEATURE_SKB_PRE_ALLOC
 
 #Enable USB specific APIS
 ifeq ($(CONFIG_HIF_USB), y)
-ccflags-y += -DHIF_USB \
+cppflags-y += -DHIF_USB \
             -DCONFIG_PLD_USB_CNSS \
             -DDEBUG_HL_LOGGING \
             -DCONFIG_HL_SUPPORT
 endif
 
 #Enable FW logs through ini
-ccflags-y += -DCONFIG_FW_LOGS_BASED_ON_INI
+cppflags-y += -DCONFIG_FW_LOGS_BASED_ON_INI
 
 #Enable pci read/write config functions
-ccflags-$(CONFIG_ATH_PCI) += -DATH_PCI
+cppflags-$(CONFIG_ATH_PCI) += -DATH_PCI
 
 #Enable power management suspend/resume functionality
-ccflags-$(CONFIG_ATH_BUS_PM) += -DATH_BUS_PM
+cppflags-$(CONFIG_ATH_BUS_PM) += -DATH_BUS_PM
 
 #Enable FLOWMAC module support
-ccflags-$(CONFIG_ATH_SUPPORT_FLOWMAC_MODULE) += -DATH_SUPPORT_FLOWMAC_MODULE
+cppflags-$(CONFIG_ATH_SUPPORT_FLOWMAC_MODULE) += -DATH_SUPPORT_FLOWMAC_MODULE
 
 #Enable spectral support
-ccflags-$(CONFIG_ATH_SUPPORT_SPECTRAL) += -DATH_SUPPORT_SPECTRAL
+cppflags-$(CONFIG_ATH_SUPPORT_SPECTRAL) += -DATH_SUPPORT_SPECTRAL
 
 #Enable WDI Event support
-ccflags-$(CONFIG_WDI_EVENT_ENABLE) += -DWDI_EVENT_ENABLE
+cppflags-$(CONFIG_WDI_EVENT_ENABLE) += -DWDI_EVENT_ENABLE
 
 #Endianness selection
 ifeq ($(CONFIG_LITTLE_ENDIAN), y)
-ccflags-y += -DANI_LITTLE_BYTE_ENDIAN
-ccflags-y += -DANI_LITTLE_BIT_ENDIAN
-ccflags-y += -DDOT11F_LITTLE_ENDIAN_HOST
+cppflags-y += -DANI_LITTLE_BYTE_ENDIAN
+cppflags-y += -DANI_LITTLE_BIT_ENDIAN
+cppflags-y += -DDOT11F_LITTLE_ENDIAN_HOST
 else
-ccflags-y += -DANI_BIG_BYTE_ENDIAN
-ccflags-y += -DBIG_ENDIAN_HOST
+cppflags-y += -DANI_BIG_BYTE_ENDIAN
+cppflags-y += -DBIG_ENDIAN_HOST
 endif
 
 #Enable TX reclaim support
-ccflags-$(CONFIG_TX_CREDIT_RECLAIM_SUPPORT) += -DTX_CREDIT_RECLAIM_SUPPORT
+cppflags-$(CONFIG_TX_CREDIT_RECLAIM_SUPPORT) += -DTX_CREDIT_RECLAIM_SUPPORT
 
 #Enable FTM support
-ccflags-$(CONFIG_QCA_WIFI_FTM) += -DQCA_WIFI_FTM
+cppflags-$(CONFIG_QCA_WIFI_FTM) += -DQCA_WIFI_FTM
 
 #Enable Checksum Offload support
-ccflags-$(CONFIG_CHECKSUM_OFFLOAD) += -DCHECKSUM_OFFLOAD
+cppflags-$(CONFIG_CHECKSUM_OFFLOAD) += -DCHECKSUM_OFFLOAD
 
 #Enable Checksum Offload support
-ccflags-$(CONFIG_IPA_OFFLOAD) += -DIPA_OFFLOAD
+cppflags-$(CONFIG_IPA_OFFLOAD) += -DIPA_OFFLOAD
 
 ifeq ($(CONFIG_ARCH_SDX20), y)
-ccflags-y += -DSYNC_IPA_READY
+cppflags-y += -DSYNC_IPA_READY
 endif
 
 #Enable GTK Offload
-ccflags-$(CONFIG_GTK_OFFLOAD) += -DWLAN_FEATURE_GTK_OFFLOAD
+cppflags-$(CONFIG_GTK_OFFLOAD) += -DWLAN_FEATURE_GTK_OFFLOAD
 
 #Enable External WoW
-ccflags-$(CONFIG_EXT_WOW) += -DWLAN_FEATURE_EXTWOW_SUPPORT
+cppflags-$(CONFIG_EXT_WOW) += -DWLAN_FEATURE_EXTWOW_SUPPORT
 
 #Mark it as SMP Kernel
-ccflags-$(CONFIG_SMP) += -DQCA_CONFIG_SMP
+cppflags-$(CONFIG_SMP) += -DQCA_CONFIG_SMP
 
-ccflags-$(CONFIG_CHNL_MATRIX_RESTRICTION) += -DWLAN_ENABLE_CHNL_MATRIX_RESTRICTION
+cppflags-$(CONFIG_CHNL_MATRIX_RESTRICTION) += -DWLAN_ENABLE_CHNL_MATRIX_RESTRICTION
 
 #Enable ICMP packet disable powersave feature
-ccflags-$(CONFIG_ICMP_DISABLE_PS) += -DWLAN_ICMP_DISABLE_PS
+cppflags-$(CONFIG_ICMP_DISABLE_PS) += -DWLAN_ICMP_DISABLE_PS
 
 #Enable OBSS feature
-ccflags-y += -DQCA_HT_2040_COEX
+cppflags-y += -DQCA_HT_2040_COEX
 
 #enable MCC TO SCC switch
-ccflags-$(CONFIG_FEATURE_WLAN_MCC_TO_SCC_SWITCH) += -DFEATURE_WLAN_MCC_TO_SCC_SWITCH
+cppflags-$(CONFIG_FEATURE_WLAN_MCC_TO_SCC_SWITCH) += -DFEATURE_WLAN_MCC_TO_SCC_SWITCH
 
 #enable wlan auto shutdown feature
-ccflags-$(CONFIG_FEATURE_WLAN_AUTO_SHUTDOWN) += -DFEATURE_WLAN_AUTO_SHUTDOWN
+cppflags-$(CONFIG_FEATURE_WLAN_AUTO_SHUTDOWN) += -DFEATURE_WLAN_AUTO_SHUTDOWN
 
 #enable AP-AP ACS Optimization
-ccflags-$(CONFIG_FEATURE_WLAN_AP_AP_ACS_OPTIMIZE) += -DFEATURE_WLAN_AP_AP_ACS_OPTIMIZE
+cppflags-$(CONFIG_FEATURE_WLAN_AP_AP_ACS_OPTIMIZE) += -DFEATURE_WLAN_AP_AP_ACS_OPTIMIZE
 
 #Enable 4address scheme
-ccflags-$(CONFIG_FEATURE_WLAN_STA_4ADDR_SCHEME) += -DFEATURE_WLAN_STA_4ADDR_SCHEME
+cppflags-$(CONFIG_FEATURE_WLAN_STA_4ADDR_SCHEME) += -DFEATURE_WLAN_STA_4ADDR_SCHEME
 
 #enable MDM/SDX special config
-ccflags-$(CONFIG_MDM_PLATFORM) += -DMDM_PLATFORM
+cppflags-$(CONFIG_MDM_PLATFORM) += -DMDM_PLATFORM
 
 #Disable STA-AP Mode DFS support
-ccflags-$(CONFIG_FEATURE_WLAN_STA_AP_MODE_DFS_DISABLE) += -DFEATURE_WLAN_STA_AP_MODE_DFS_DISABLE
+cppflags-$(CONFIG_FEATURE_WLAN_STA_AP_MODE_DFS_DISABLE) += -DFEATURE_WLAN_STA_AP_MODE_DFS_DISABLE
 
 #Open P2P device interface only for non-Mobile router use cases
-ccflags-$(CONFIG_WLAN_OPEN_P2P_INTERFACE) += -DWLAN_OPEN_P2P_INTERFACE
+cppflags-$(CONFIG_WLAN_OPEN_P2P_INTERFACE) += -DWLAN_OPEN_P2P_INTERFACE
 
 #Enable 2.4 GHz social channels in 5 GHz only mode for p2p usage
-ccflags-$(CONFIG_WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY) += -DWLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY
+cppflags-$(CONFIG_WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY) += -DWLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY
 
 #Green AP feature
-ccflags-$(CONFIG_QCACLD_FEATURE_GREEN_AP) += -DWLAN_SUPPORT_GREEN_AP
+cppflags-$(CONFIG_QCACLD_FEATURE_GREEN_AP) += -DWLAN_SUPPORT_GREEN_AP
 
 #Stats & Quota Metering feature
 ifeq ($(CONFIG_IPA_OFFLOAD), y)
 ifeq ($(CONFIG_QCACLD_FEATURE_METERING), y)
-ccflags-y += -DFEATURE_METERING
+cppflags-y += -DFEATURE_METERING
 endif
 endif
 
-ccflags-$(CONFIG_TUFELLO_DUAL_FW_SUPPORT) += -DCONFIG_TUFELLO_DUAL_FW_SUPPORT
-ccflags-$(CONFIG_CHANNEL_HOPPING_ALL_BANDS) += -DCHANNEL_HOPPING_ALL_BANDS
+cppflags-$(CONFIG_TUFELLO_DUAL_FW_SUPPORT) += -DCONFIG_TUFELLO_DUAL_FW_SUPPORT
+cppflags-$(CONFIG_CHANNEL_HOPPING_ALL_BANDS) += -DCHANNEL_HOPPING_ALL_BANDS
 
 #Enable Signed firmware support for split binary format
-ccflags-$(CONFIG_QCA_SIGNED_SPLIT_BINARY_SUPPORT) += -DQCA_SIGNED_SPLIT_BINARY_SUPPORT
+cppflags-$(CONFIG_QCA_SIGNED_SPLIT_BINARY_SUPPORT) += -DQCA_SIGNED_SPLIT_BINARY_SUPPORT
 
 #Enable single firmware binary format
-ccflags-$(CONFIG_QCA_SINGLE_BINARY_SUPPORT) += -DQCA_SINGLE_BINARY_SUPPORT
+cppflags-$(CONFIG_QCA_SINGLE_BINARY_SUPPORT) += -DQCA_SINGLE_BINARY_SUPPORT
 
 #Enable collecting target RAM dump after kernel panic
-ccflags-$(CONFIG_TARGET_RAMDUMP_AFTER_KERNEL_PANIC) += -DTARGET_RAMDUMP_AFTER_KERNEL_PANIC
+cppflags-$(CONFIG_TARGET_RAMDUMP_AFTER_KERNEL_PANIC) += -DTARGET_RAMDUMP_AFTER_KERNEL_PANIC
 
 #Enable/disable secure firmware feature
-ccflags-$(CONFIG_FEATURE_SECURE_FIRMWARE) += -DFEATURE_SECURE_FIRMWARE
+cppflags-$(CONFIG_FEATURE_SECURE_FIRMWARE) += -DFEATURE_SECURE_FIRMWARE
 
-ccflags-$(CONFIG_ATH_PCIE_ACCESS_DEBUG) += -DCONFIG_ATH_PCIE_ACCESS_DEBUG
+cppflags-$(CONFIG_ATH_PCIE_ACCESS_DEBUG) += -DCONFIG_ATH_PCIE_ACCESS_DEBUG
 
 # Enable feature support for Linux version QCMBR
-ccflags-$(CONFIG_LINUX_QCMBR) += -DLINUX_QCMBR
+cppflags-$(CONFIG_LINUX_QCMBR) += -DLINUX_QCMBR
 
 # Enable featue sync tsf between multi devices
-ccflags-$(CONFIG_WLAN_SYNC_TSF) += -DWLAN_FEATURE_TSF
-ccflags-$(CONFIG_WLAN_SYNC_TSF_PLUS) += -DWLAN_FEATURE_TSF_PLUS
+cppflags-$(CONFIG_WLAN_SYNC_TSF) += -DWLAN_FEATURE_TSF
+cppflags-$(CONFIG_WLAN_SYNC_TSF_PLUS) += -DWLAN_FEATURE_TSF_PLUS
 
-ccflags-$(CONFIG_WLAN_RX_FULL_REORDER_OL) += -DWLAN_FEATURE_RX_FULL_REORDER_OL
-ccflags-$(CONFIG_ATH_PROCFS_DIAG_SUPPORT) += -DCONFIG_ATH_PROCFS_DIAG_SUPPORT
-ccflags-$(CONFIG_11AC_TXCOMPACT) += -DATH_11AC_TXCOMPACT
+cppflags-$(CONFIG_WLAN_RX_FULL_REORDER_OL) += -DWLAN_FEATURE_RX_FULL_REORDER_OL
+cppflags-$(CONFIG_ATH_PROCFS_DIAG_SUPPORT) += -DCONFIG_ATH_PROCFS_DIAG_SUPPORT
+cppflags-$(CONFIG_11AC_TXCOMPACT) += -DATH_11AC_TXCOMPACT
 
-ccflags-$(CONFIG_HELIUMPLUS) += -DHELIUMPLUS
-ccflags-$(CONFIG_AR900B) += -DAR900B
-ccflags-$(CONFIG_HTT_PADDR64) += -DHTT_PADDR64
-ccflags-$(CONFIG_OL_RX_INDICATION_RECORD) += -DOL_RX_INDICATION_RECORD
-ccflags-$(CONFIG_TSOSEG_DEBUG) += -DTSOSEG_DEBUG
+cppflags-$(CONFIG_HELIUMPLUS) += -DHELIUMPLUS
+cppflags-$(CONFIG_AR900B) += -DAR900B
+cppflags-$(CONFIG_HTT_PADDR64) += -DHTT_PADDR64
+cppflags-$(CONFIG_OL_RX_INDICATION_RECORD) += -DOL_RX_INDICATION_RECORD
+cppflags-$(CONFIG_TSOSEG_DEBUG) += -DTSOSEG_DEBUG
 
-ccflags-$(CONFIG_ENABLE_DEBUG_ADDRESS_MARKING) += -DENABLE_DEBUG_ADDRESS_MARKING
-ccflags-$(CONFIG_FEATURE_TSO) += -DFEATURE_TSO
-ccflags-$(CONFIG_FEATURE_TSO_DEBUG) += -DFEATURE_TSO_DEBUG
+cppflags-$(CONFIG_ENABLE_DEBUG_ADDRESS_MARKING) += -DENABLE_DEBUG_ADDRESS_MARKING
+cppflags-$(CONFIG_FEATURE_TSO) += -DFEATURE_TSO
+cppflags-$(CONFIG_FEATURE_TSO_DEBUG) += -DFEATURE_TSO_DEBUG
 
-ccflags-$(CONFIG_WLAN_LRO) += -DFEATURE_LRO
+cppflags-$(CONFIG_WLAN_LRO) += -DFEATURE_LRO
 
-ccflags-$(CONFIG_FEATURE_AP_MCC_CH_AVOIDANCE) += -DFEATURE_AP_MCC_CH_AVOIDANCE
+cppflags-$(CONFIG_FEATURE_AP_MCC_CH_AVOIDANCE) += -DFEATURE_AP_MCC_CH_AVOIDANCE
 
-ccflags-$(CONFIG_MPC_UT_FRAMEWORK) += -DMPC_UT_FRAMEWORK
+cppflags-$(CONFIG_MPC_UT_FRAMEWORK) += -DMPC_UT_FRAMEWORK
 
-ccflags-$(CONFIG_FEATURE_EPPING) += -DWLAN_FEATURE_EPPING
+cppflags-$(CONFIG_FEATURE_EPPING) += -DWLAN_FEATURE_EPPING
 
-ccflags-$(CONFIG_WLAN_OFFLOAD_PACKETS) += -DWLAN_FEATURE_OFFLOAD_PACKETS
+cppflags-$(CONFIG_WLAN_OFFLOAD_PACKETS) += -DWLAN_FEATURE_OFFLOAD_PACKETS
 
-ccflags-$(CONFIG_WLAN_FEATURE_DISA) += -DWLAN_FEATURE_DISA
+cppflags-$(CONFIG_WLAN_FEATURE_DISA) += -DWLAN_FEATURE_DISA
 
-ccflags-$(CONFIG_WLAN_FEATURE_FIPS) += -DWLAN_FEATURE_FIPS
+cppflags-$(CONFIG_WLAN_FEATURE_FIPS) += -DWLAN_FEATURE_FIPS
 
-ccflags-$(CONFIG_LFR_SUBNET_DETECTION) += -DFEATURE_LFR_SUBNET_DETECTION
+cppflags-$(CONFIG_LFR_SUBNET_DETECTION) += -DFEATURE_LFR_SUBNET_DETECTION
 
-ccflags-$(CONFIG_MCC_TO_SCC_SWITCH) += -DFEATURE_WLAN_MCC_TO_SCC_SWITCH
+cppflags-$(CONFIG_MCC_TO_SCC_SWITCH) += -DFEATURE_WLAN_MCC_TO_SCC_SWITCH
 
-ccflags-$(CONFIG_WLAN_FEATURE_NAN_DATAPATH) += -DWLAN_FEATURE_NAN_DATAPATH
+cppflags-$(CONFIG_WLAN_FEATURE_NAN_DATAPATH) += -DWLAN_FEATURE_NAN_DATAPATH
 
-ccflags-$(CONFIG_NAN_CONVERGENCE) += -DWLAN_FEATURE_NAN_CONVERGENCE
+cppflags-$(CONFIG_NAN_CONVERGENCE) += -DWLAN_FEATURE_NAN_CONVERGENCE
 
-ccflags-$(CONFIG_FEATURE_WLAN_D0WOW) += -DFEATURE_WLAN_D0WOW
+cppflags-$(CONFIG_FEATURE_WLAN_D0WOW) += -DFEATURE_WLAN_D0WOW
 
-ccflags-$(CONFIG_SHADOW_V2) += -DCONFIG_SHADOW_V2
-ccflags-$(CONFIG_QCA6290_HEADERS_DEF) += -DQCA6290_HEADERS_DEF
-ccflags-$(CONFIG_QCA_WIFI_QCA6290) += -DQCA_WIFI_QCA6290
-ccflags-$(CONFIG_QCA_WIFI_QCA8074) += -DQCA_WIFI_QCA8074
-ccflags-$(CONFIG_QCA_WIFI_QCA8074_VP) += -DQCA_WIFI_QCA8074_VP
-ccflags-$(CONFIG_DP_INTR_POLL_BASED) += -DDP_INTR_POLL_BASED
-ccflags-$(CONFIG_TX_PER_PDEV_DESC_POOL) += -DTX_PER_PDEV_DESC_POOL
-ccflags-$(CONFIG_DP_TRACE) += -DCONFIG_DP_TRACE
-ccflags-$(CONFIG_FEATURE_TSO) += -DFEATURE_TSO
-ccflags-$(CONFIG_TSO_DEBUG_LOG_ENABLE) += -DTSO_DEBUG_LOG_ENABLE
-ccflags-$(CONFIG_DP_LFR) += -DDP_LFR
-ccflags-$(CONFIG_HTT_PADDR64) += -DHTT_PADDR64
+cppflags-$(CONFIG_SHADOW_V2) += -DCONFIG_SHADOW_V2
+cppflags-$(CONFIG_QCA6290_HEADERS_DEF) += -DQCA6290_HEADERS_DEF
+cppflags-$(CONFIG_QCA_WIFI_QCA6290) += -DQCA_WIFI_QCA6290
+cppflags-$(CONFIG_QCA_WIFI_QCA8074) += -DQCA_WIFI_QCA8074
+cppflags-$(CONFIG_QCA_WIFI_QCA8074_VP) += -DQCA_WIFI_QCA8074_VP
+cppflags-$(CONFIG_DP_INTR_POLL_BASED) += -DDP_INTR_POLL_BASED
+cppflags-$(CONFIG_TX_PER_PDEV_DESC_POOL) += -DTX_PER_PDEV_DESC_POOL
+cppflags-$(CONFIG_DP_TRACE) += -DCONFIG_DP_TRACE
+cppflags-$(CONFIG_FEATURE_TSO) += -DFEATURE_TSO
+cppflags-$(CONFIG_TSO_DEBUG_LOG_ENABLE) += -DTSO_DEBUG_LOG_ENABLE
+cppflags-$(CONFIG_DP_LFR) += -DDP_LFR
+cppflags-$(CONFIG_HTT_PADDR64) += -DHTT_PADDR64
 
 ifeq ($(CONFIG_QCA6290_11AX), y)
-ccflags-y += -DQCA_WIFI_QCA6290_11AX
+cppflags-y += -DQCA_WIFI_QCA6290_11AX
 endif
 
-ccflags-$(CONFIG_WLAN_FEATURE_11AX) += -DWLAN_FEATURE_11AX
-ccflags-$(CONFIG_WLAN_FEATURE_11AX) += -DWLAN_FEATURE_11AX_BSS_COLOR
+cppflags-$(CONFIG_WLAN_FEATURE_11AX) += -DWLAN_FEATURE_11AX
+cppflags-$(CONFIG_WLAN_FEATURE_11AX) += -DWLAN_FEATURE_11AX_BSS_COLOR
 
 # Dummy flag for WIN/MCL converged data path compilation
-ccflags-y += -DDP_PRINT_ENABLE=0
-ccflags-y += -DATH_SUPPORT_WRAP=0
-ccflags-y += -DQCA_HOST2FW_RXBUF_RING
+cppflags-y += -DDP_PRINT_ENABLE=0
+cppflags-y += -DATH_SUPPORT_WRAP=0
+cppflags-y += -DQCA_HOST2FW_RXBUF_RING
 #endof dummy flags
 
 # DFS component
-ccflags-y += -DQCA_MCL_DFS_SUPPORT
+cppflags-y += -DQCA_MCL_DFS_SUPPORT
 ifeq ($(CONFIG_WLAN_FEATURE_DFS_OFFLOAD), y)
-ccflags-y += -DWLAN_DFS_FULL_OFFLOAD
+cppflags-y += -DWLAN_DFS_FULL_OFFLOAD
 else
-ccflags-y += -DWLAN_DFS_PARTIAL_OFFLOAD
+cppflags-y += -DWLAN_DFS_PARTIAL_OFFLOAD
 endif
-ccflags-y += -DDFS_COMPONENT_ENABLE
-ccflags-y += -DQCA_DFS_USE_POLICY_MANAGER
-ccflags-y += -DQCA_DFS_NOL_PLATFORM_DRV_SUPPORT
+cppflags-y += -DDFS_COMPONENT_ENABLE
+cppflags-y += -DQCA_DFS_USE_POLICY_MANAGER
+cppflags-y += -DQCA_DFS_NOL_PLATFORM_DRV_SUPPORT
 
-ccflags-$(CONFIG_WLAN_DEBUGFS) += -DWLAN_DEBUGFS
+cppflags-$(CONFIG_WLAN_DEBUGFS) += -DWLAN_DEBUGFS
 
-ccflags-$(CONFIG_DYNAMIC_DEBUG) += -DFEATURE_MULTICAST_HOST_FW_MSGS
+cppflags-$(CONFIG_DYNAMIC_DEBUG) += -DFEATURE_MULTICAST_HOST_FW_MSGS
 
-ccflags-$(CONFIG_ENABLE_SMMU_S1_TRANSLATION) += -DENABLE_SMMU_S1_TRANSLATION
+cppflags-$(CONFIG_ENABLE_SMMU_S1_TRANSLATION) += -DENABLE_SMMU_S1_TRANSLATION
 
 #Flag to enable NUD tracking
-ccflags-$(CONFIG_WLAN_NUD_TRACKING) += -DWLAN_NUD_TRACKING
+cppflags-$(CONFIG_WLAN_NUD_TRACKING) += -DWLAN_NUD_TRACKING
+
+KBUILD_CPPFLAGS += $(cppflags-y)
 
 # Currently, for versions of gcc which support it, the kernel Makefile
 # is disabling the maybe-uninitialized warning.  Re-enable it for the