Skip to content

Commit f9424d5

Browse files
committed
Move nrf_wifi_util_get_ra to utils lib
Move nrf_wifi_util_get_ra to utils lib to make it accessible across other files. Signed-off-by: Ravi Dondaputi <[email protected]>
1 parent 055143f commit f9424d5

File tree

3 files changed

+24
-19
lines changed

3 files changed

+24
-19
lines changed

fw_if/umac_if/src/system/tx.c

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
#include "list.h"
1313
#include "queue.h"
14+
#include "util.h"
1415
#include "system/hal_api.h"
1516
#include "system/fmac_tx.h"
1617
#include "system/fmac_api.h"
@@ -1864,25 +1865,6 @@ static int get_ac(unsigned int tid,
18641865
}
18651866

18661867

1867-
unsigned char *nrf_wifi_util_get_ra(struct nrf_wifi_fmac_vif_ctx *vif,
1868-
void *nwb)
1869-
{
1870-
if ((vif->if_type == NRF_WIFI_IFTYPE_STATION)
1871-
#ifdef NRF70_RAW_DATA_TX
1872-
|| (vif->if_type == NRF_WIFI_STA_TX_INJECTOR)
1873-
#endif /* NRF70_RAW_DATA_TX */
1874-
#ifdef NRF70_PROMISC_DATA_RX
1875-
|| (vif->if_type == NRF_WIFI_STA_PROMISC)
1876-
|| (vif->if_type == NRF_WIFI_STA_PROMISC_TX_INJECTOR)
1877-
#endif
1878-
) {
1879-
return vif->bssid;
1880-
}
1881-
1882-
return nrf_wifi_osal_nbuf_data_get(nwb);
1883-
}
1884-
1885-
18861868
#ifdef NRF70_RAW_DATA_TX
18871869
static bool nrf_wifi_raw_pkt_mode_enabled(struct nrf_wifi_fmac_vif_ctx *vif)
18881870
{

utils/inc/util.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#else
2020
#include "host_rpu_umac_if.h"
2121
#endif
22+
#include <system/fmac_structs.h>
2223

2324
#ifndef ARRAY_SIZE
2425
#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
@@ -35,4 +36,7 @@ bool nrf_wifi_utils_is_mac_addr_valid(const char *mac_addr);
3536

3637
int nrf_wifi_utils_chan_to_freq(enum nrf_wifi_band band,
3738
unsigned short chan);
39+
40+
unsigned char *nrf_wifi_util_get_ra(struct nrf_wifi_fmac_vif_ctx *vif,
41+
void *nwb);
3842
#endif /* __UTIL_H__ */

utils/src/util.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <nrf71_wifi_ctrl.h>
1515
#else
1616
#include "host_rpu_data_if.h"
17+
#include <system/fmac_structs.h>
1718
#endif
1819

1920
int nrf_wifi_utils_hex_str_to_val(unsigned char *hex_arr,
@@ -131,3 +132,21 @@ int nrf_wifi_utils_chan_to_freq(enum nrf_wifi_band band,
131132
return freq;
132133

133134
}
135+
136+
unsigned char *nrf_wifi_util_get_ra(struct nrf_wifi_fmac_vif_ctx *vif,
137+
void *nwb)
138+
{
139+
if ((vif->if_type == NRF_WIFI_IFTYPE_STATION)
140+
#ifdef NRF70_RAW_DATA_TX
141+
|| (vif->if_type == NRF_WIFI_STA_TX_INJECTOR)
142+
#endif /* NRF70_RAW_DATA_TX */
143+
#ifdef NRF70_PROMISC_DATA_RX
144+
|| (vif->if_type == NRF_WIFI_STA_PROMISC)
145+
|| (vif->if_type == NRF_WIFI_STA_PROMISC_TX_INJECTOR)
146+
#endif
147+
) {
148+
return vif->bssid;
149+
}
150+
151+
return nrf_wifi_osal_nbuf_data_get(nwb);
152+
}

0 commit comments

Comments
 (0)