From 5b74e086e67bdca2469f2a2d1defb963d0075264 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 8 Feb 2015 12:24:37 +0200 Subject: [PATCH] P2P: Document P2P_CONNECT-auto Commit b31be3a0fd58b38e669d804aa082b1039408566f ('P2P: Add automatic GO Negotiation vs. join-a-group selection') added this P2P_CONNECT 'auto' parameter, but did not update any documentation on it. Signed-off-by: Jouni Malinen --- wpa_supplicant/README-P2P | 6 +++++- wpa_supplicant/ctrl_iface.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/wpa_supplicant/README-P2P b/wpa_supplicant/README-P2P index 5c1e4f927..5fe83e215 100644 --- a/wpa_supplicant/README-P2P +++ b/wpa_supplicant/README-P2P @@ -130,7 +130,7 @@ join-a-group style PD instead of GO Negotiation style PD. p2p_connect [display|keypad] [persistent|persistent=] [join|auth] - [go_intent=<0..15>] [freq=] [ht40] [vht] [provdisc] + [go_intent=<0..15>] [freq=] [ht40] [vht] [provdisc] [auto] Start P2P group formation with a discovered P2P peer. This includes optional group owner negotiation, group interface setup, provisioning, @@ -171,6 +171,10 @@ used prior to starting GO Negotiation as a workaround with some deployed P2P implementations that require this to allow the user to accept the connection. +"auto" can be used to request wpa_supplicant to automatically figure +out whether the peer device is operating as a GO and if so, use +join-a-group operation rather than GO Negotiation. + p2p_group_add [persistent|persistent=] [freq=] [ht40] [vht] diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index c4a457748..a6ebe3b2b 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -4721,7 +4721,7 @@ static int p2p_ctrl_connect(struct wpa_supplicant *wpa_s, char *cmd, /* <"pbc" | "pin" | PIN> [label|display|keypad|p2ps] * [persistent|persistent=] * [join] [auth] [go_intent=<0..15>] [freq=] [provdisc] - * [ht40] [vht] */ + * [ht40] [vht] [auto] */ if (hwaddr_aton(cmd, addr)) return -1;