path: root/wpa_supplicant/main.c
diff options
authorJouni Malinen <jouni@qca.qualcomm.com>2014-10-03 19:50:21 (GMT)
committerJouni Malinen <j@w1.fi>2014-10-03 19:50:21 (GMT)
commitf1a613118ed51f3ecbaab8940744f4ff205c2e67 (patch)
tree2f326495bf197cf9a5071e0bbbf056e143567415 /wpa_supplicant/main.c
parentc4a8c173b8030cca292df16ba93c6504bb24f4f8 (diff)
P2P: Use only the -m config for P2P management device
Previously, the case of non-netdev P2P management device ended up pulling in both the main interface (e.g., wlan0) and P2P Device interface (from command line -m argument) as configuration. Similarly, the main interface ended up included both configuration files. This is not really helpful for various use cases, e.g., when permanent P2P group information is stored in the P2P Devince interface, but it gets duplicated in the main station interface configuration. Clean this up by changing the -m<file> argument to replace, not concatenate, configuration information. In other words, the main station interface will not read this configuration and the P2P Device interface (non-netdev) does not read parameters from the station interface configuration file. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Diffstat (limited to 'wpa_supplicant/main.c')
1 files changed, 2 insertions, 1 deletions
diff --git a/wpa_supplicant/main.c b/wpa_supplicant/main.c
index d2e839d..e596468 100644
--- a/wpa_supplicant/main.c
+++ b/wpa_supplicant/main.c
@@ -331,7 +331,8 @@ int main(int argc, char *argv[])
if (wpa_s->global->p2p == NULL &&
(wpa_s->drv_flags &
- wpas_p2p_add_p2pdev_interface(wpa_s) < 0)
+ wpas_p2p_add_p2pdev_interface(wpa_s, iface->conf_p2p_dev) <
+ 0)
exitcode = -1;
#endif /* CONFIG_P2P */