diff --git a/Kbuild b/Kbuild
index 170ac855da..653352dac7 100644
--- a/Kbuild
+++ b/Kbuild
@@ -2138,6 +2138,14 @@ ifdef CONFIG_CFG_NUM_OF_TDLS_CONN_TABLE_ENTRIES
 ccflags-y += -DCFG_TGT_NUM_TDLS_CONN_TABLE_ENTRIES=$(CONFIG_CFG_NUM_OF_TDLS_CONN_TABLE_ENTRIES)
 endif
 
+ifdef CONFIG_SIR_MAX_SUPPORTED_BSS
+ccflags-y += -DSIR_MAX_SUPPORTED_BSS=$(CONFIG_SIR_MAX_SUPPORTED_BSS)
+endif
+
+ifdef CONFIG_SIR_SAP_MAX_NUM_PEERS
+ccflags-y += -DSIR_SAP_MAX_NUM_PEERS=$(CONFIG_SIR_SAP_MAX_NUM_PEERS)
+endif
+
 KBUILD_CPPFLAGS += $(cppflags-y)
 
 # Currently, for versions of gcc which support it, the kernel Makefile
diff --git a/configs/genoa.common b/configs/genoa.common
index 5cd6663694..01deb86bf6 100644
--- a/configs/genoa.common
+++ b/configs/genoa.common
@@ -154,4 +154,12 @@ CONFIG_CFG_NUM_OF_ADDITIONAL_FW_PEERS := 0
 
 # Number of TDLS peers that each Tdls vdev can track
 CONFIG_CFG_NUM_OF_TDLS_CONN_TABLE_ENTRIES := 4
+
+#Number of BSS sessions at a time, used for allocating memory should never be
+#less then number of vdevs - INI
+CONFIG_SIR_MAX_SUPPORTED_BSS := 3
+
+#Number of STA sessions max connected to our SAP, used for allocating memory
+#should never be less then number of max peers - INI
+CONFIG_SIR_SAP_MAX_NUM_PEERS := 10
 ###################################
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index 31043f2dcf..2b90af51a6 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -50,7 +50,9 @@ typedef struct sAniSirGlobal *tpAniSirGlobal;
 #include <dot11f.h>
 #include "wlan_policy_mgr_api.h"
 
+#ifndef SIR_MAX_SUPPORTED_BSS
 #define SIR_MAX_SUPPORTED_BSS 5
+#endif
 
 #define OFFSET_OF(structType, fldName)   (&((structType *)0)->fldName)
 
@@ -113,7 +115,9 @@ typedef uint8_t tSirVersionString[SIR_VERSION_STRING_LEN];
 #define MAX_PEER_STA 12
 
 /* Maximum number of peers for SAP */
+#ifndef SIR_SAP_MAX_NUM_PEERS
 #define SIR_SAP_MAX_NUM_PEERS 32
+#endif
 
 #define SIR_KRK_KEY_LEN 16
 #define SIR_BTK_KEY_LEN 32