Browse Source

qcacld-3.0: Define max number of keep alive pattern at one place

Currently there are 2 places where max number of keep live pattern
are defined:
1.  #define WMA_MAXNUM_PERIODIC_TX_PTRNS 6
And it can be configured by CONFIG_CFG_MAX_PERIODIC_TX_PTRNS.
2. #define MAXNUM_PERIODIC_TX_PTRNS 6
And it is hard coded value.

It is possible to have different values defined on some platform,
so we might give tgt_cfg->num_keep_alive_pattern value as 2,
but still allow more than 2 keep alive patterns adding to target,
where assert might happen.

Fix it by defining max number of keep alive pattern at one place.

Change-Id: I70ec3fa2e56a39cf8086750d966d95e41b2b75a7
CRs-Fixed: 2745443
Will Huang 4 years ago
parent
commit
73574ad2d8
4 changed files with 4 additions and 9 deletions
  1. 1 1
      Kbuild
  2. 2 0
      core/mac/inc/sir_api.h
  3. 0 7
      core/wma/inc/wma_internal.h
  4. 1 1
      core/wma/src/wma_main.c

+ 1 - 1
Kbuild

@@ -3411,7 +3411,7 @@ ccflags-y += -DCFG_TGT_DEFAULT_ROAM_OFFLOAD_MAX_VDEV=$(CONFIG_CFG_ROAM_OFFLOAD_M
 endif
 
 ifdef CONFIG_CFG_MAX_PERIODIC_TX_PTRNS
-ccflags-y += -DWMA_MAXNUM_PERIODIC_TX_PTRNS=$(CONFIG_CFG_MAX_PERIODIC_TX_PTRNS)
+ccflags-y += -DMAXNUM_PERIODIC_TX_PTRNS=$(CONFIG_CFG_MAX_PERIODIC_TX_PTRNS)
 endif
 
 ifdef CONFIG_CFG_MAX_STA_VDEVS

+ 2 - 0
core/mac/inc/sir_api.h

@@ -72,7 +72,9 @@ typedef uint8_t tSirVersionString[SIR_VERSION_STRING_LEN];
 
 /* Periodic Tx pattern offload feature */
 #define PERIODIC_TX_PTRN_MAX_SIZE 1536
+#ifndef MAXNUM_PERIODIC_TX_PTRNS
 #define MAXNUM_PERIODIC_TX_PTRNS 6
+#endif
 
 /* FW response timeout values in milli seconds */
 #define SIR_PEER_ASSOC_TIMEOUT           (4000) /* 4 seconds */

+ 0 - 7
core/wma/inc/wma_internal.h

@@ -46,13 +46,6 @@
 #define WMA_LINK_MONITOR_DEFAULT_TIME_SECS 10
 #define WMA_KEEP_ALIVE_DEFAULT_TIME_SECS   5
 
-/* The maximum number of patterns that can be transmitted by the firmware
- *  and maximum patterns size.
- */
-#ifndef WMA_MAXNUM_PERIODIC_TX_PTRNS
-#define WMA_MAXNUM_PERIODIC_TX_PTRNS 6
-#endif
-
 #define WMA_WMM_EXPO_TO_VAL(val)        ((1 << (val)) - 1)
 
 #define MAX_HT_MCS_IDX 8

+ 1 - 1
core/wma/src/wma_main.c

@@ -334,7 +334,7 @@ static void wma_set_default_tgt_config(tp_wma_handle wma_handle,
 	tgt_cfg->num_multicast_filter_entries =
 		CFG_TGT_MAX_MULTICAST_FILTER_ENTRIES;
 	tgt_cfg->num_wow_filters = 0;
-	tgt_cfg->num_keep_alive_pattern = WMA_MAXNUM_PERIODIC_TX_PTRNS;
+	tgt_cfg->num_keep_alive_pattern = MAXNUM_PERIODIC_TX_PTRNS;
 	tgt_cfg->num_max_sta_vdevs = CFG_TGT_DEFAULT_MAX_STA_VDEVS;
 	tgt_cfg->keep_alive_pattern_size = 0;
 	tgt_cfg->max_tdls_concurrent_sleep_sta =