Index: usr.sbin/wpa/wpa_cli/wpa_cli.8
===================================================================
--- usr.sbin/wpa/wpa_cli/wpa_cli.8
+++ usr.sbin/wpa/wpa_cli/wpa_cli.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 16, 2005
+.Dd November 20, 2016
 .Dt WPA_CLI 8
 .Os
 .Sh NAME
@@ -31,8 +31,14 @@
 .Nm wpa_cli
 .Nd "text-based frontend program for interacting with wpa_supplicant"
 .Sh SYNOPSIS
-.Nm
-.Op Ar commands
+.Nm Op \fB-p\fR Ar path to ctrl sockets
+.Op \fB-i\fR Ar ifname
+.Op \fB-hvB
+.Op \fB-a\fR Ar action file
+.Op \fB-P\fR Ar pid file
+.Op \fB-g\fR Ar global ctrl
+.Op \fB-G\fR Ar ping interval
+.Op Ar command...
 .Sh DESCRIPTION
 The
 .Nm
@@ -144,6 +150,42 @@
 CTRL-REQ-OTP-2:Challenge 1235663 needed for SSID foobar
 > otp 2 9876
 .Ed
+.Sh OPTIONS
+The following options are available:
+.Bl -tag -width indent
+.It Fl p Ar path
+Set the path where control sockets should be found.
+This should match the \fBctrl_interface\fR in your
+.Xr wpa_supplicant.conf 5 .
+Default path is /var/run/wpa_supplicant .
+.It Fl i Ar ifname
+The interface that is to be configured.
+By default, the first interface found in the socket path is used.
+.It Fl h
+Show help.
+.It Fl v
+Show version information.
+.It Fl B
+Run a daemon in the background.
+.It Fl a Ar action file
+Run in daemon mode executing the action file based on events from
+.Xr wpa_supplicant 8 .
+.It Fl P Ar pid file
+Set the PID file location.
+.It Fl g Ar global ctrl
+Use a global control interface to
+.Xr wpa_supplicant 8
+rather than default UNIX domain sockets.
+.It Fl G Ar ping interval
+Wait
+.Dq ping interval
+seconds before sending each ping to
+.Xr wpa_supplicant 8
+daemon.
+See \fBping\fR below.
+.It \fBcommand \fR
+See available commands in the next section.
+.El
 .Sh COMMANDS
 The following commands may be supplied on the command line
 or at a prompt when operating interactively.
@@ -150,6 +192,14 @@
 .Bl -tag -width indent
 .It Ic status
 Report the current WPA/EAPOL/EAP status for the current interface.
+.It Ic ifname
+Shows the current interface name.
+Default interface is the first interface found in the socket path.
+.It Ic ping
+Pings the
+.Xr wpa_supplicant 8
+utility.
+This command can be used to test the status of wpa_supplicant(8) daemon.
 .It Ic mib
 Report MIB variables (dot1x, dot11) for the current interface.
 .It Ic help
@@ -156,14 +206,13 @@
 Show usage help.
 .It Ic interface Op Ar ifname
 Show available interfaces and/or set the current interface
-when multiple are available.
+when multiple interfaces are available.
 .It Ic level Ar debug_level
 Change the debugging level in
 .Xr wpa_supplicant 8 .
 Larger numbers generate more messages.
 .It Ic license
-Display the full
-license for
+Display the full license for
 .Nm .
 .It Ic logoff
 Send the IEEE 802.1X EAPOL state machine into the
@@ -192,6 +241,53 @@
 Configure an identity for an SSID.
 .It Ic password Ar network_id password
 Configure a password for an SSID.
+.It Ic new_password Ar network_id password
+Change the password for an SSID.
+.It Ic pin Ar network_id pin
+Configure a pin for an SSID.
+.It Ic passphrase Ar network_id passphrase
+Configure a private key passphrase for an SSID.
+.It Ic bssid Ar network_id bssid
+Set a preferred BSSID for an SSID
+.It Ic blacklist Op Ar bssid | clear
+Add a BSSID to the blacklist.
+When invoked without any extra arguments, display the blacklist.
+Using with
+.Dq clear
+results in
+.Nm
+to clear the blacklist.
+.It Ic list_networks
+List configured networks.
+.It Ic select_network Ar network_id
+Select a network and disable others.
+.It Ic enable_network Ar network_id
+Enable a network.
+.It Ic disable_network Ar network_id
+Disable a network.
+.It Ic add_network
+Add a network.
+.It Ic remove_network Ar network_id
+Remove a network.
+.It Ic set_network Op Ar network_id variable value
+Set network variables.
+Shows a list of variables when run without arguments.
+.It Ic get_network Ar network_id variable
+Get network variables.
+.It Ic disconnect
+Disconnect and wait for reassociate/reconnect command before connecting.
+.It Ic reconnect
+Similar to \fBreassociate\fR, but only takes effect if already disconnected.
+.It Ic scan
+Request new BSS scan.
+.It Ic scan_results
+Get the latest BSS scan results.
+This command should be invoked after running a BSS scan with \fBscan\fR.
+.It Ic bss Op Ar idx | bssid
+Get a detailed BSS scan result for network identified by
+.Dq bssid
+or
+.Dq idx .
 .It Ic otp Ar network_id password
 Configure a one-time password for an SSID.
 .It Ic terminate
@@ -198,6 +294,12 @@
 Force
 .Xr wpa_supplicant 8
 to terminate.
+.It Ic interface_add Ar ifname Op Ar confname driver ctrl_interface driver_param bridge_name
+Add a new interface with given parameters.
+.It Ic interface_remove Ar ifname
+Remove the interface.
+.It Ic interface_list
+List available interfaces.
 .It Ic quit
 Exit
 .Nm .
@@ -217,6 +319,8 @@
 .An Jouni Malinen Aq Mt j@w1.fi .
 This manual page is derived from the
 .Pa README
-file included in the
+and
+.Pa wpa_cli.c
+files included in the
 .Nm wpa_supplicant
 distribution.