aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/p2p_supplicant.h
diff options
context:
space:
mode:
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/p2p_supplicant.h
parentc4a8c173b8030cca292df16ba93c6504bb24f4f8 (diff)
downloadhostap-f1a613118ed51f3ecbaab8940744f4ff205c2e67.zip
hostap-f1a613118ed51f3ecbaab8940744f4ff205c2e67.tar.gz
hostap-f1a613118ed51f3ecbaab8940744f4ff205c2e67.tar.bz2
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/p2p_supplicant.h')
-rw-r--r--wpa_supplicant/p2p_supplicant.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/wpa_supplicant/p2p_supplicant.h b/wpa_supplicant/p2p_supplicant.h
index 841d6df..b61d57f 100644
--- a/wpa_supplicant/p2p_supplicant.h
+++ b/wpa_supplicant/p2p_supplicant.h
@@ -16,7 +16,8 @@ struct p2p_peer_info;
struct p2p_channels;
struct wps_event_fail;
-int wpas_p2p_add_p2pdev_interface(struct wpa_supplicant *wpa_s);
+int wpas_p2p_add_p2pdev_interface(struct wpa_supplicant *wpa_s,
+ const char *conf_p2p_dev);
struct wpa_supplicant * wpas_get_p2p_go_iface(struct wpa_supplicant *wpa_s,
const u8 *ssid, size_t ssid_len);
struct wpa_supplicant * wpas_get_p2p_client_iface(struct wpa_supplicant *wpa_s,