OrgZephyr/zephyr
OrgZephyr
/
zephyr
mirror of https://github.com/zephyrproject-rtos/zephyr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

drivers: nrfwifi: Fix build error 

This crept-in due to bad merge conflict resolution.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
This commit is contained in:
Chaitanya Tata 2024-10-16 01:39:19 +05:30 committed by Carles Cufí
parent c08b846b47
commit 9eedb6d7c8
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/wifi/nrfwifi/inc/fmac_main.h
View File

@ -133,7 +133,13 @@ void set_tx_pwr_ceil_default(struct nrf_wifi_tx_pwr_ceil_params *pwr_ceil_params
const char *nrf_wifi_get_drv_version(void); const char *nrf_wifi_get_drv_version(void);
enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv_priv_zep); enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv_priv_zep);
enum nrf_wifi_status nrf_wifi_fmac_dev_rem_zep(struct nrf_wifi_drv_priv_zep *drv_priv_zep); enum nrf_wifi_status nrf_wifi_fmac_dev_rem_zep(struct nrf_wifi_drv_priv_zep *drv_priv_zep);
#endif /* !CONFIG_NRF_WIFI_BUILD_ONLY_MODE */ struct nrf_wifi_vif_ctx_zep *nrf_wifi_get_vif_ctx(struct net_if *iface);
#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY
void nrf_wifi_rpu_recovery_cb(void *vif_ctx,
void *event_data,
unsigned int event_len);
#endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
#endif /* !CONFIG_NRF70_OFFLOADED_RAW_TX */
#ifdef CONFIG_NRF_WIFI_BUILD_ONLY_MODE #ifdef CONFIG_NRF_WIFI_BUILD_ONLY_MODE
inline enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx) inline enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx)
{ {
@ -144,11 +150,4 @@ inline enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx)
#else #else
enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx); enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx);
#endif /* CONFIG_NRF_WIFI_BUILD_ONLY_MODE */ #endif /* CONFIG_NRF_WIFI_BUILD_ONLY_MODE */
#ifndef CONFIG_NRF70_OFFLOADED_RAW_TX
struct nrf_wifi_vif_ctx_zep *nrf_wifi_get_vif_ctx(struct net_if *iface);
#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY
void nrf_wifi_rpu_recovery_cb(void *vif_ctx,
void *event_data,
unsigned int event_len);
#endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
#endif /* __ZEPHYR_FMAC_MAIN_H__ */ #endif /* __ZEPHYR_FMAC_MAIN_H__ */