diff --git a/hal/wifi3.0/be/hal_be_generic_api.c b/hal/wifi3.0/be/hal_be_generic_api.c
index 21848033fb..12f5830edf 100644
--- a/hal/wifi3.0/be/hal_be_generic_api.c
+++ b/hal/wifi3.0/be/hal_be_generic_api.c
@@ -246,7 +246,7 @@ uint32_t hal_tx_comp_get_buffer_source_generic_be(void *hal_desc)
  *
  * Return: buffer type
  */
-uint8_t hal_tx_comp_get_release_reason_generic_be(void *hal_desc)
+static uint8_t hal_tx_comp_get_release_reason_generic_be(void *hal_desc)
 {
 	uint32_t comp_desc = *(uint32_t *)(((uint8_t *)hal_desc) +
 			WBM2SW_COMPLETION_RING_TX_TQM_RELEASE_REASON_OFFSET);
@@ -264,7 +264,7 @@ uint8_t hal_tx_comp_get_release_reason_generic_be(void *hal_desc)
  *
  * Return: uint8_t
  */
-uint8_t hal_get_wbm_internal_error_generic_be(void *hal_desc)
+static uint8_t hal_get_wbm_internal_error_generic_be(void *hal_desc)
 {
 	/*
 	 * TODO -  This func is called by tx comp and wbm error handler
diff --git a/hal/wifi3.0/be/hal_be_generic_api.h b/hal/wifi3.0/be/hal_be_generic_api.h
index 7693ff3d00..d20b5582f9 100644
--- a/hal/wifi3.0/be/hal_be_generic_api.h
+++ b/hal/wifi3.0/be/hal_be_generic_api.h
@@ -34,8 +34,9 @@
  *
  * Return: none
  */
-void hal_tx_comp_get_status_generic_be(void *desc, void *ts1,
-				       struct hal_soc *hal)
+static inline void
+hal_tx_comp_get_status_generic_be(void *desc, void *ts1,
+				  struct hal_soc *hal)
 {
 	uint8_t rate_stats_valid = 0;
 	uint32_t rate_stats = 0;
diff --git a/hal/wifi3.0/be/hal_be_tx.h b/hal/wifi3.0/be/hal_be_tx.h
index 578df2388f..57e6d72d2f 100644
--- a/hal/wifi3.0/be/hal_be_tx.h
+++ b/hal/wifi3.0/be/hal_be_tx.h
@@ -510,6 +510,8 @@ hal_tx_populate_bank_register(hal_soc_handle_t hal_soc_hdl,
 }
 #endif
 
+#ifdef DP_TX_IMPLICIT_RBM_MAPPING
+
 #define RBM_MAPPING_BMSK HWIO_TCL_R0_RBM_MAPPING0_SW2TCL1_RING_BMSK
 #define RBM_MAPPING_SHFT HWIO_TCL_R0_RBM_MAPPING0_SW2TCL2_RING_SHFT
 
@@ -561,6 +563,14 @@ hal_tx_config_rbm_mapping_be(struct hal_soc *hal_soc,
 	/* write rbm mapped value to register address */
 	HAL_REG_WRITE(hal_soc, reg_addr, reg_val);
 }
+#else
+static inline void
+hal_tx_config_rbm_mapping_be(struct hal_soc *hal_soc,
+			     hal_ring_handle_t hal_ring_hdl,
+			     uint8_t rbm_id)
+{
+}
+#endif
 
 /**
  * hal_tx_desc_set_buf_addr_be - Fill Buffer Address information in Tx Desc