diff --git a/Kbuild b/Kbuild index dd7642bc2741..942ce2ddee2d 100644 --- a/Kbuild +++ b/Kbuild @@ -3634,6 +3634,7 @@ ccflags-$(CONFIG_FOURTH_CONNECTION_AUTO) += -DFOURTH_CONNECTION_AUTO ccflags-$(CONFIG_WMI_SEND_RECV_QMI) += -DWLAN_FEATURE_WMI_SEND_RECV_QMI cppflags-$(CONFIG_WDI3_STATS_UPDATE) += -DWDI3_STATS_UPDATE +cppflags-$(CONFIG_WDI3_STATS_BW_MONITOR) += -DWDI3_STATS_BW_MONITOR cppflags-$(CONFIG_WLAN_CUSTOM_DSCP_UP_MAP) += -DWLAN_CUSTOM_DSCP_UP_MAP cppflags-$(CONFIG_WLAN_SEND_DSCP_UP_MAP_TO_FW) += -DWLAN_SEND_DSCP_UP_MAP_TO_FW diff --git a/components/ipa/core/src/wlan_ipa_core.c b/components/ipa/core/src/wlan_ipa_core.c index 73d0328f2c3c..cab86502813d 100644 --- a/components/ipa/core/src/wlan_ipa_core.c +++ b/components/ipa/core/src/wlan_ipa_core.c @@ -1871,7 +1871,7 @@ static void wlan_ipa_uc_offload_enable_disable(struct wlan_ipa_priv *ipa_ctx, } } -#ifdef WDI3_STATS_UPDATE +#ifdef WDI3_STATS_BW_MONITOR static void wlan_ipa_uc_bw_monitor(struct wlan_ipa_priv *ipa_ctx, bool stop) { qdf_ipa_wdi_bw_info_t bw_info; diff --git a/components/ipa/core/src/wlan_ipa_stats.c b/components/ipa/core/src/wlan_ipa_stats.c index ad125fdac321..31752f6eb0a7 100644 --- a/components/ipa/core/src/wlan_ipa_stats.c +++ b/components/ipa/core/src/wlan_ipa_stats.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2021 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 @@ -750,8 +750,9 @@ void wlan_ipa_uc_stat(struct wlan_ipa_priv *ipa_ctx) #ifdef FEATURE_METERING #ifdef WDI3_STATS_UPDATE +#ifdef WDI3_STATS_BW_MONITOR /** - * wlan_ipa_wdi_meter_notifier_cb() - WLAN to IPA callback handler. + * __wlan_ipa_wdi_meter_notifier_cb() - WLAN to IPA callback handler. * IPA calls to get WLAN stats or set quota limit. * @priv: pointer to private data registered with IPA (we register a * pointer to the IPA context) @@ -799,6 +800,13 @@ static void __wlan_ipa_wdi_meter_notifier_cb(qdf_ipa_wdi_meter_evt_type_t evt, ipa_debug("Requested BW level: %d", ipa_ctx->curr_bw_level); } +#else +static void __wlan_ipa_wdi_meter_notifier_cb(qdf_ipa_wdi_meter_evt_type_t evt, + void *data) +{ +} +#endif + void wlan_ipa_update_tx_stats(struct wlan_ipa_priv *ipa_ctx, uint64_t sta_tx, uint64_t ap_tx) { diff --git a/configs/default_defconfig b/configs/default_defconfig index 457e58764dfb..54177a02f146 100644 --- a/configs/default_defconfig +++ b/configs/default_defconfig @@ -281,6 +281,9 @@ endif ifeq ($(CONFIG_ARCH_KONA), y) CONFIG_QCACLD_FEATURE_METERING := y CONFIG_WDI3_STATS_UPDATE := y +ifeq ($(CONFIG_WDI3_STATS_UPDATE), y) +CONFIG_WDI3_STATS_BW_MONITOR := y +endif CONFIG_WLAN_SYNC_TSF_TIMER := y endif @@ -292,6 +295,9 @@ CONFIG_WBM_IDLE_LSB_WR_CNF_WAR := y CONFIG_WLAN_FEATURE_RX_BUFFER_POOL := y CONFIG_DP_RX_BUFFER_POOL_SIZE := 128 CONFIG_DP_RX_BUFFER_POOL_ALLOC_THRES := 5 +ifeq ($(CONFIG_WDI3_STATS_UPDATE), y) +CONFIG_WDI3_STATS_BW_MONITOR := y +endif endif endif