Skip to content

Commit

Permalink
hostap: Change the name of the control api struct
Browse files Browse the repository at this point in the history
Zephyr requires that the name of the variable is not the
same as the struct as seen by this warning:

modules/hostap/src/supp_api.c:64:WARNING:
  Violation to rule 5.7 (Tag name should be unique)
  tag: wpa_supp_api_ctrl

Signed-off-by: Jukka Rissanen <[email protected]>
  • Loading branch information
jukkar committed Jan 11, 2024
1 parent 791779a commit 47d633d
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions modules/hostap/src/supp_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ struct wpa_supp_api_ctrl {
bool terminate;
};

static struct wpa_supp_api_ctrl wpa_supp_api_ctrl;
static struct wpa_supp_api_ctrl wpas_api_ctrl;

static void supp_shell_connect_status(struct k_work *work);

Expand Down Expand Up @@ -127,7 +127,7 @@ static void supp_shell_connect_status(struct k_work *work)
int status = CONNECTION_SUCCESS;
int conn_result = CONNECTION_FAILURE;
struct wpa_supplicant *wpa_s;
struct wpa_supp_api_ctrl *ctrl = &wpa_supp_api_ctrl;
struct wpa_supp_api_ctrl *ctrl = &wpas_api_ctrl;

k_mutex_lock(&wpa_supplicant_mutex, K_FOREVER);

Expand Down Expand Up @@ -169,9 +169,9 @@ static void supp_shell_connect_status(struct k_work *work)
static inline void wpa_supp_restart_status_work(void)
{
/* Terminate synchronously */
wpa_supp_api_ctrl.terminate = 1;
k_work_flush_delayable(&wpa_supp_status_work, &wpa_supp_api_ctrl.sync);
wpa_supp_api_ctrl.terminate = 0;
wpas_api_ctrl.terminate = 1;
k_work_flush_delayable(&wpa_supp_status_work, &wpas_api_ctrl.sync);
wpas_api_ctrl.terminate = 0;

/* Start afresh */
k_work_reschedule(&wpa_supp_status_work, K_MSEC(10));
Expand Down Expand Up @@ -316,9 +316,9 @@ int supplicant_connect(const struct device *dev, struct wifi_connect_req_params

zephyr_wpa_cli_cmd_v("select_network %d", resp.network_id);

wpa_supp_api_ctrl.dev = dev;
wpa_supp_api_ctrl.requested_op = CONNECT;
wpa_supp_api_ctrl.connection_timeout = params->timeout;
wpas_api_ctrl.dev = dev;
wpas_api_ctrl.requested_op = CONNECT;
wpas_api_ctrl.connection_timeout = params->timeout;

out:
k_mutex_unlock(&wpa_supplicant_mutex);
Expand Down Expand Up @@ -351,8 +351,8 @@ int supplicant_disconnect(const struct device *dev)
goto out;
}

wpa_supp_api_ctrl.dev = dev;
wpa_supp_api_ctrl.requested_op = DISCONNECT;
wpas_api_ctrl.dev = dev;
wpas_api_ctrl.requested_op = DISCONNECT;

__wpa_cli_cmd_v("disconnect");

Expand Down

0 comments on commit 47d633d

Please sign in to comment.