From 4d2b29a80869b36c72b20ead77993c7b069520e8 Mon Sep 17 00:00:00 2001 From: Shivani Baranwal Date: Thu, 11 Jul 2024 23:12:24 +0530 Subject: [PATCH] P2P2: Split sta_p2p_reset handling into two parts Signed-off-by: Shivani Baranwal --- p2p.c | 15 ++++++++++++--- sigma_dut.h | 6 +++--- sta.c | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/p2p.c b/p2p.c index 1c211ad..39a5f36 100644 --- a/p2p.c +++ b/p2p.c @@ -1901,9 +1901,9 @@ static enum sigma_cmd_result cmd_sta_get_psk(struct sigma_dut *dut, } -enum sigma_cmd_result cmd_sta_p2p_reset(struct sigma_dut *dut, - struct sigma_conn *conn, - struct sigma_cmd *cmd) +enum sigma_cmd_result sta_p2p_reset_default(struct sigma_dut *dut, + struct sigma_conn *conn, + struct sigma_cmd *cmd) { const char *intf = get_param(cmd, "interface"); struct wfa_cs_p2p_group *grp, *prev; @@ -1982,6 +1982,15 @@ enum sigma_cmd_result cmd_sta_p2p_reset(struct sigma_dut *dut, } +static enum sigma_cmd_result cmd_sta_p2p_reset(struct sigma_dut *dut, + struct sigma_conn *conn, + struct sigma_cmd *cmd) +{ + dut->program = PROGRAM_P2P; + return sta_p2p_reset_default(dut, conn, cmd); +} + + static enum sigma_cmd_result cmd_sta_get_p2p_ip_config(struct sigma_dut *dut, struct sigma_conn *conn, struct sigma_cmd *cmd) diff --git a/sigma_dut.h b/sigma_dut.h index 85b9a8b..ab27708 100644 --- a/sigma_dut.h +++ b/sigma_dut.h @@ -1431,9 +1431,9 @@ void stop_dhcp(struct sigma_dut *dut, const char *group_ifname, int go); int p2p_discover_peer(struct sigma_dut *dut, const char *ifname, const char *peer, int full); const char * get_p2p_group_ifname(struct sigma_dut *dut, const char *ifname); -enum sigma_cmd_result cmd_sta_p2p_reset(struct sigma_dut *dut, - struct sigma_conn *conn, - struct sigma_cmd *cmd); +enum sigma_cmd_result sta_p2p_reset_default(struct sigma_dut *dut, + struct sigma_conn *conn, + struct sigma_cmd *cmd); /* basic.c */ void basic_register_cmds(void); diff --git a/sta.c b/sta.c index 6f2fca4..9b2bade 100644 --- a/sta.c +++ b/sta.c @@ -11444,7 +11444,7 @@ static enum sigma_cmd_result cmd_sta_reset_default(struct sigma_dut *dut, wpa_command(intf, "STA_AUTOCONNECT 0"); if (dut->program != PROGRAM_VHT) - return cmd_sta_p2p_reset(dut, conn, cmd); + return sta_p2p_reset_default(dut, conn, cmd); return 1; }