From 9bab9cd8c24a02986ba0b33326aa381d69e5a346 Mon Sep 17 00:00:00 2001 From: Vinod Kumar Pirla Date: Fri, 3 May 2024 08:06:55 -0700 Subject: [PATCH] qcacld-3.0: Enable peer trasition history by default Enable peer transition history by default and remove the compile time flag. Change-Id: Idcce6f5e418d4e4571caaadce07d787c0deaecd8 CRs-Fixed: 3774914 --- Kbuild | 3 --- Kconfig | 4 ---- configs/config_to_feature.h | 6 ------ configs/kiwi_defconfig | 3 --- configs/kiwi_v2_defconfig | 3 --- configs/mango_defconfig | 3 --- configs/niobe_consolidate_kiwi-v2_defconfig | 1 - configs/peach_defconfig | 3 --- configs/pineapple_consolidate_peach_defconfig | 1 - configs/pineapple_consolidate_qca6750_defconfig | 1 - configs/sun_consolidate_kiwi-v2_defconfig | 1 - configs/sun_consolidate_peach_defconfig | 1 - core/wma/inc/wma.h | 2 +- core/wma/src/wma_dev_if.c | 2 +- 14 files changed, 2 insertions(+), 32 deletions(-) diff --git a/Kbuild b/Kbuild index fca65b3767..ea59c3a925 100644 --- a/Kbuild +++ b/Kbuild @@ -4337,9 +4337,6 @@ ccflags-$(CONFIG_WLAN_FEATURE_11BE) += -DWLAN_FEATURE_11BE ccflags-$(CONFIG_WLAN_FEATURE_11BE_MLO) += -DWLAN_FEATURE_11BE_MLO ccflags-$(CONFIG_WLAN_FEATURE_11BE_MLO) += -DWLAN_FEATURE_11BE_MLO_ADV_FEATURE ccflags-$(CONFIG_WLAN_HDD_MULTI_VDEV_SINGLE_NDEV) += -DWLAN_HDD_MULTI_VDEV_SINGLE_NDEV -ifeq ($(CONFIG_WLAN_FEATURE_11BE_MLO), y) -ccflags-$(CONFIG_WLAN_FEATURE_PEER_TRANS_HIST) += -DWLAN_FEATURE_PEER_TRANS_HIST -endif ccflags-$(CONFIG_WLAN_FEATURE_11BE_MLO) += -DWLAN_SUPPORT_11BE_D3_0 ccflags-$(CONFIG_FIX_TXDMA_LIMITATION) += -DFIX_TXDMA_LIMITATION ccflags-$(CONFIG_FEATURE_AST) += -DFEATURE_AST diff --git a/Kconfig b/Kconfig index cba56faf31..0cf4d86f38 100644 --- a/Kconfig +++ b/Kconfig @@ -1172,10 +1172,6 @@ config WLAN_FEATURE_11BE_MLO bool "Enable WLAN_FEATURE_11BE_MLO" default n -config WLAN_FEATURE_PEER_TRANS_HIST - bool "Enable Peer transition history" - default n - config WLAN_HDD_MULTI_VDEV_SINGLE_NDEV bool "Enable WLAN_HDD_MULTI_VDEV_SINGLE_NDEV" default n diff --git a/configs/config_to_feature.h b/configs/config_to_feature.h index 42957c0d18..c05860d823 100644 --- a/configs/config_to_feature.h +++ b/configs/config_to_feature.h @@ -1840,12 +1840,6 @@ #define WLAN_FEATURE_11BE_MLO_ADV_FEATURE (1) #endif -#ifdef CONFIG_WLAN_FEATURE_11BE_MLO -#ifdef CONFIG_WLAN_FEATURE_PEER_TRANS_HIST -#define WLAN_FEATURE_PEER_TRANS_HIST (1) -#endif -#endif - #ifdef CONFIG_WLAN_FEATURE_11BE_MLO #define WLAN_SUPPORT_11BE_D3_0 (1) #endif diff --git a/configs/kiwi_defconfig b/configs/kiwi_defconfig index 815151c310..df9a3b250d 100644 --- a/configs/kiwi_defconfig +++ b/configs/kiwi_defconfig @@ -16,9 +16,6 @@ CONFIG_CFG_MAX_STA_VDEVS := 4 #Enable 11BE MLO CONFIG_WLAN_FEATURE_11BE_MLO := y -#Enable Peer table transition history -CONFIG_WLAN_FEATURE_PEER_TRANS_HIST := y - #BMISS offload max vdev config CONFIG_CFG_BMISS_OFFLOAD_MAX_VDEV := 4 diff --git a/configs/kiwi_v2_defconfig b/configs/kiwi_v2_defconfig index d2826dd70d..d91d328630 100644 --- a/configs/kiwi_v2_defconfig +++ b/configs/kiwi_v2_defconfig @@ -30,9 +30,6 @@ CONFIG_CFG_MAX_STA_VDEVS := 4 #Enable 11BE MLO CONFIG_WLAN_FEATURE_11BE_MLO := y -#Enable Peer table transition history -CONFIG_WLAN_FEATURE_PEER_TRANS_HIST := y - #Enable Single NDEV Multi VDEV CONFIG_WLAN_HDD_MULTI_VDEV_SINGLE_NDEV := y diff --git a/configs/mango_defconfig b/configs/mango_defconfig index 5876591f7a..4c6c076681 100644 --- a/configs/mango_defconfig +++ b/configs/mango_defconfig @@ -18,9 +18,6 @@ CONFIG_CFG_MAX_STA_VDEVS := 4 #Enable 11BE MLO CONFIG_WLAN_FEATURE_11BE_MLO := y -#Enable Peer table transition history -CONFIG_WLAN_FEATURE_PEER_TRANS_HIST := y - #BMISS offload max vdev config CONFIG_CFG_BMISS_OFFLOAD_MAX_VDEV := 4 diff --git a/configs/niobe_consolidate_kiwi-v2_defconfig b/configs/niobe_consolidate_kiwi-v2_defconfig index 28b9efe406..58e3d95807 100644 --- a/configs/niobe_consolidate_kiwi-v2_defconfig +++ b/configs/niobe_consolidate_kiwi-v2_defconfig @@ -32,4 +32,3 @@ CONFIG_QDF_TEST=y CONFIG_DYNAMIC_DEBUG=y CONFIG_FEATURE_WLM_STATS=y CONFIG_WLAN_TRACE_HIDE_MAC_ADDRESS_DISABLE=y -CONFIG_WLAN_FEATURE_PEER_TRANS_HIST=y diff --git a/configs/peach_defconfig b/configs/peach_defconfig index ca86f47004..966657d5ee 100644 --- a/configs/peach_defconfig +++ b/configs/peach_defconfig @@ -11,9 +11,6 @@ CONFIG_CFG_MAX_STA_VDEVS := 4 #Enable 11BE MLO CONFIG_WLAN_FEATURE_11BE_MLO := y -#Enable Peer table transition history -CONFIG_WLAN_FEATURE_PEER_TRANS_HIST := y - #BMISS offload max vdev config CONFIG_CFG_BMISS_OFFLOAD_MAX_VDEV := 4 diff --git a/configs/pineapple_consolidate_peach_defconfig b/configs/pineapple_consolidate_peach_defconfig index 28b9efe406..58e3d95807 100644 --- a/configs/pineapple_consolidate_peach_defconfig +++ b/configs/pineapple_consolidate_peach_defconfig @@ -32,4 +32,3 @@ CONFIG_QDF_TEST=y CONFIG_DYNAMIC_DEBUG=y CONFIG_FEATURE_WLM_STATS=y CONFIG_WLAN_TRACE_HIDE_MAC_ADDRESS_DISABLE=y -CONFIG_WLAN_FEATURE_PEER_TRANS_HIST=y diff --git a/configs/pineapple_consolidate_qca6750_defconfig b/configs/pineapple_consolidate_qca6750_defconfig index 865976a215..c810b0a047 100644 --- a/configs/pineapple_consolidate_qca6750_defconfig +++ b/configs/pineapple_consolidate_qca6750_defconfig @@ -26,4 +26,3 @@ CONFIG_WLAN_FEATURE_DP_TX_DESC_HISTORY=y CONFIG_WLAN_RECORD_RX_PADDR=y CONFIG_QDF_TEST=y CONFIG_FEATURE_WLM_STATS=y -CONFIG_WLAN_FEATURE_PEER_TRANS_HIST=y diff --git a/configs/sun_consolidate_kiwi-v2_defconfig b/configs/sun_consolidate_kiwi-v2_defconfig index 28b9efe406..58e3d95807 100644 --- a/configs/sun_consolidate_kiwi-v2_defconfig +++ b/configs/sun_consolidate_kiwi-v2_defconfig @@ -32,4 +32,3 @@ CONFIG_QDF_TEST=y CONFIG_DYNAMIC_DEBUG=y CONFIG_FEATURE_WLM_STATS=y CONFIG_WLAN_TRACE_HIDE_MAC_ADDRESS_DISABLE=y -CONFIG_WLAN_FEATURE_PEER_TRANS_HIST=y diff --git a/configs/sun_consolidate_peach_defconfig b/configs/sun_consolidate_peach_defconfig index 28b9efe406..58e3d95807 100644 --- a/configs/sun_consolidate_peach_defconfig +++ b/configs/sun_consolidate_peach_defconfig @@ -32,4 +32,3 @@ CONFIG_QDF_TEST=y CONFIG_DYNAMIC_DEBUG=y CONFIG_FEATURE_WLM_STATS=y CONFIG_WLAN_TRACE_HIDE_MAC_ADDRESS_DISABLE=y -CONFIG_WLAN_FEATURE_PEER_TRANS_HIST=y diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index a9653495fe..32a1eccea0 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -1767,7 +1767,7 @@ QDF_STATUS wma_peer_unmap_conf_cb(uint8_t vdev_id, bool wma_objmgr_peer_exist(tp_wma_handle wma, uint8_t *peer_addr, uint8_t *peer_vdev_id); -#ifdef WLAN_FEATURE_PEER_TRANS_HIST +#ifdef WLAN_FEATURE_11BE_MLO_ADV_FEATURE /** * wma_peer_tbl_trans_add_entry() - Add peer transition to peer history * @peer: Object manager peer pointer diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 52bcba7880..d9d2dda4f6 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -1646,7 +1646,7 @@ bool wma_objmgr_peer_exist(tp_wma_handle wma, return true; } -#ifdef WLAN_FEATURE_PEER_TRANS_HIST +#ifdef WLAN_FEATURE_11BE_MLO_ADV_FEATURE void wma_peer_tbl_trans_add_entry(struct wlan_objmgr_peer *peer, bool is_create, struct cdp_peer_setup_info *peer_info) {