Move nrf_wifi_util_get_ra to utils lib

Move nrf_wifi_util_get_ra to fmac_utils lib to make it accessible
across other files.

Signed-off-by: Ravi Dondaputi <[email protected]>

Author: rado17

fw_if/umac_if/inc/common/fmac_util.h

@@ -14,6 +14,9 @@
 #include "fmac_structs_common.h"
 
 #include "fmac_structs_common.h"
+#ifdef NRF70_SYSTEM_MODE
+#include "system/fmac_structs.h"
+#endif /* NRF70_SYSTEM_MODE */
 #include "common/pack_def.h"
 
 
@@ -107,4 +110,9 @@ bool nrf_wifi_util_is_arr_zero(unsigned char *arr,
 void *wifi_fmac_priv(struct nrf_wifi_fmac_priv *def);
 void *wifi_dev_priv(struct nrf_wifi_fmac_dev_ctx *def);
 
+#ifdef NRF70_SYSTEM_MODE
+unsigned char *nrf_wifi_util_get_ra(struct nrf_wifi_fmac_vif_ctx *vif,
+				    void *nwb);
+#endif /* NRF70_SYSTEM_MODE */
+
 #endif /* __FMAC_UTIL_H__ */

fw_if/umac_if/src/common/fmac_util.c

@@ -18,6 +18,9 @@
 #else
 #include "host_rpu_umac_if.h"
 #endif
+#ifdef NRF70_SYSTEM_MODE
+#include <system/fmac_structs.h>
+#endif /* NRF70_SYSTEM_MODE */
 
 bool nrf_wifi_util_is_multicast_addr(const unsigned char *addr)
 {
@@ -91,6 +94,26 @@ bool nrf_wifi_util_is_arr_zero(unsigned char *arr,
 	return true;
 }
 
+#ifdef NRF70_SYSTEM_MODE
+unsigned char *nrf_wifi_util_get_ra(struct nrf_wifi_fmac_vif_ctx *vif,
+				    void *nwb)
+{
+	if ((vif->if_type == NRF_WIFI_IFTYPE_STATION)
+#ifdef NRF70_RAW_DATA_TX
+	    || (vif->if_type == NRF_WIFI_STA_TX_INJECTOR)
+#endif /* NRF70_RAW_DATA_TX */
+#ifdef NRF70_PROMISC_DATA_RX
+	    || (vif->if_type == NRF_WIFI_STA_PROMISC)
+	    || (vif->if_type == NRF_WIFI_STA_PROMISC_TX_INJECTOR)
+#endif
+	    ) {
+		return vif->bssid;
+	}
+
+	return nrf_wifi_osal_nbuf_data_get(nwb);
+}
+#endif /* NRF70_SYSTEM_MODE */
+
 void *wifi_fmac_priv(struct nrf_wifi_fmac_priv *def)
 {
 	return &def->priv;

fw_if/umac_if/src/system/tx.c

@@ -11,6 +11,7 @@
 
 #include "list.h"
 #include "queue.h"
+#include "util.h"
 #include "system/hal_api.h"
 #include "system/fmac_tx.h"
 #include "system/fmac_api.h"
@@ -1864,25 +1865,6 @@ static int get_ac(unsigned int tid,
 }
 
 
-unsigned char *nrf_wifi_util_get_ra(struct nrf_wifi_fmac_vif_ctx *vif,
-				    void *nwb)
-{
-	if ((vif->if_type == NRF_WIFI_IFTYPE_STATION)
-#ifdef NRF70_RAW_DATA_TX
-	    || (vif->if_type == NRF_WIFI_STA_TX_INJECTOR)
-#endif /* NRF70_RAW_DATA_TX */
-#ifdef NRF70_PROMISC_DATA_RX
-	    || (vif->if_type == NRF_WIFI_STA_PROMISC)
-	    || (vif->if_type == NRF_WIFI_STA_PROMISC_TX_INJECTOR)
-#endif
-	    ) {
-		return vif->bssid;
-	}
-
-	return nrf_wifi_osal_nbuf_data_get(nwb);
-}
-
-
 #ifdef NRF70_RAW_DATA_TX
 static bool nrf_wifi_raw_pkt_mode_enabled(struct nrf_wifi_fmac_vif_ctx *vif)
 {

utils/inc/util.h

@@ -19,6 +19,9 @@
 #else
 #include "host_rpu_umac_if.h"
 #endif
+#if !defined CONFIG_NRF70_OFFLOADED_RAW_TX && !defined CONFIG_NRF70_RADIO_TEST
+#include <system/fmac_structs.h>
+#endif /* !CONFIG_NRF70_OFFLOADED_RAW_TX */
 
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))

utils/src/util.c

@@ -14,6 +14,7 @@
 #include <nrf71_wifi_ctrl.h>
 #else
 #include "host_rpu_data_if.h"
+#include <system/fmac_structs.h>
 #endif
 
 int nrf_wifi_utils_hex_str_to_val(unsigned char *hex_arr,