aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSasha Levitskiy <sanek@google.com>2015-08-05 13:02:59 -0700
committerSasha Levitskiy <sanek@google.com>2015-08-05 13:26:25 -0700
commitdaa60e5cc09fc4ad1a7c1b914d04e741e0052556 (patch)
treeaff5a177904b324ce00a786e2767dfff5a2e0309
parent4171258d30a612645aa061cede62233b5c58ca2a (diff)
downloadwpa_supplicant_8-daa60e5cc09fc4ad1a7c1b914d04e741e0052556.tar.gz
The P2P configuration file is wrongly set as STA configuration file
Eventhough a separate configuration file is mentioned with '-m' option. Add initialization and deallocation of global.params->conf_p2p_dev Bug 22652147 Change-Id: I6fb3cf21034647b026f1e8557cda583db6bc05d3 Signed-off-by: Gautam <gautams at broadcom.com>
-rw-r--r--wpa_supplicant/wpa_supplicant.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 8fba9382..722294da 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -4652,6 +4652,9 @@ struct wpa_global * wpa_supplicant_init(struct wpa_params *params)
if (params->override_ctrl_interface)
global->params.override_ctrl_interface =
os_strdup(params->override_ctrl_interface);
+ if (params->conf_p2p_dev)
+ global->params.conf_p2p_dev =
+ os_strdup(params->conf_p2p_dev);
wpa_debug_level = global->params.wpa_debug_level =
params->wpa_debug_level;
wpa_debug_show_keys = global->params.wpa_debug_show_keys =
@@ -4788,6 +4791,7 @@ void wpa_supplicant_deinit(struct wpa_global *global)
os_free(global->params.ctrl_interface_group);
os_free(global->params.override_driver);
os_free(global->params.override_ctrl_interface);
+ os_free(global->params.conf_p2p_dev);
os_free(global->p2p_disallow_freq.range);
os_free(global->p2p_go_avoid_freq.range);