Skip to content

Commit eb877b9

Browse files
committed
[nrf fromtree] drivers: nrfwifi: Fix build error
This crept-in due to bad merge conflict resolution. Signed-off-by: Chaitanya Tata <[email protected]> (cherry picked from commit 9eedb6d)
1 parent e6d5be3 commit eb877b9

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

drivers/wifi/nrfwifi/inc/fmac_main.h

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,13 @@ void set_tx_pwr_ceil_default(struct nrf_wifi_tx_pwr_ceil_params *pwr_ceil_params
133133
const char *nrf_wifi_get_drv_version(void);
134134
enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv_priv_zep);
135135
enum nrf_wifi_status nrf_wifi_fmac_dev_rem_zep(struct nrf_wifi_drv_priv_zep *drv_priv_zep);
136-
#endif /* !CONFIG_NRF_WIFI_BUILD_ONLY_MODE */
136+
struct nrf_wifi_vif_ctx_zep *nrf_wifi_get_vif_ctx(struct net_if *iface);
137+
#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY
138+
void nrf_wifi_rpu_recovery_cb(void *vif_ctx,
139+
void *event_data,
140+
unsigned int event_len);
141+
#endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
142+
#endif /* !CONFIG_NRF70_OFFLOADED_RAW_TX */
137143
#ifdef CONFIG_NRF_WIFI_BUILD_ONLY_MODE
138144
inline enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx)
139145
{
@@ -144,11 +150,4 @@ inline enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx)
144150
#else
145151
enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx);
146152
#endif /* CONFIG_NRF_WIFI_BUILD_ONLY_MODE */
147-
#ifndef CONFIG_NRF70_OFFLOADED_RAW_TX
148-
struct nrf_wifi_vif_ctx_zep *nrf_wifi_get_vif_ctx(struct net_if *iface);
149-
#ifdef CONFIG_NRF_WIFI_RPU_RECOVERY
150-
void nrf_wifi_rpu_recovery_cb(void *vif_ctx,
151-
void *event_data,
152-
unsigned int event_len);
153-
#endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
154153
#endif /* __ZEPHYR_FMAC_MAIN_H__ */

0 commit comments

Comments
 (0)