diff mbox

[1/1] P2P: Fix P2P configuration file name

Message ID 60640e73f1565aebc741c943feefa32b776b1880.1438333196.git.gautams@broadcom.com
State Accepted
Headers show

Commit Message

Gautam (Gautam Kumar) Shukla July 31, 2015, 9:04 a.m. UTC
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

Signed-off-by: Gautam <gautams@broadcom.com>
---
 wpa_supplicant/wpa_supplicant.c |    4 ++++
 1 file changed, 4 insertions(+)

Comments

Jouni Malinen Aug. 2, 2015, 6:55 p.m. UTC | #1
On Fri, Jul 31, 2015 at 02:34:30PM +0530, Gautam wrote:
> 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

Thanks, applied with fixes to make this compile..
diff mbox

Patch

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 3b107a1..ba3f6fc 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -4843,6 +4843,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 =
@@ -4984,6 +4987,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);