diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-03-31 12:03:39 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-03-31 12:03:39 -0700 |
| commit | c78965634a7e28fbb88fb54d26c09c2ad8e93d41 (patch) | |
| tree | b97aa238629baff86e2d795b7d4c5caa2ebc4588 | |
| parent | 510ef590c404bce9eb30112db584f13f71cfbac0 (diff) | |
| parent | 87fc97def0ae2fb504441319d96a3c97a401510b (diff) | |
| download | android_external_wpa_supplicant_8-c78965634a7e28fbb88fb54d26c09c2ad8e93d41.tar.gz android_external_wpa_supplicant_8-c78965634a7e28fbb88fb54d26c09c2ad8e93d41.tar.bz2 android_external_wpa_supplicant_8-c78965634a7e28fbb88fb54d26c09c2ad8e93d41.zip | |
Merge "P2P: Fix P2P configuration file name" into wlan-service.lnx.1.0-dev.1.0
| -rw-r--r-- | wpa_supplicant/wpa_supplicant.c | 4 | ||||
| -rw-r--r-- | wpa_supplicant/wpa_supplicant_i.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index c57fe492..889dd10c 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -4825,9 +4825,11 @@ 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); +#ifdef CONFIG_P2P if (params->conf_p2p_dev) global->params.conf_p2p_dev = os_strdup(params->conf_p2p_dev); +#endif /* CONFIG_P2P */ wpa_debug_level = global->params.wpa_debug_level = params->wpa_debug_level; wpa_debug_show_keys = global->params.wpa_debug_show_keys = @@ -4964,7 +4966,9 @@ 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); +#ifdef CONFIG_P2P os_free(global->params.conf_p2p_dev); +#endif /* CONFIG_P2P */ os_free(global->p2p_disallow_freq.range); os_free(global->p2p_go_avoid_freq.range); diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h index 3407a66b..54761085 100644 --- a/wpa_supplicant/wpa_supplicant_i.h +++ b/wpa_supplicant/wpa_supplicant_i.h @@ -225,7 +225,7 @@ struct wpa_params { * This can also be %NULL. In such a case, if a P2P Device dedicated * interfaces is created, the main configuration file will be used. */ - const char *conf_p2p_dev; + char *conf_p2p_dev; #endif /* CONFIG_P2P */ }; |