diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2014-01-24 12:29:41 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2014-01-24 13:27:36 -0800 |
| commit | 1846323989242844f0e857458a8939fa5836429c (patch) | |
| tree | 6ce1227e1f39a8287783d63ed9fa038526fcd7dc /wpa_supplicant/main.c | |
| parent | 2093d0658d2f0f8b5a98df7accc97fff3b2bb7d5 (diff) | |
| download | android_external_wpa_supplicant_8-1846323989242844f0e857458a8939fa5836429c.tar.gz android_external_wpa_supplicant_8-1846323989242844f0e857458a8939fa5836429c.tar.bz2 android_external_wpa_supplicant_8-1846323989242844f0e857458a8939fa5836429c.zip | |
Cumulative patch from commit 8615bdfac90174c3730ae5e6607b85f8bbec847e
8615bdf Increase global ctrl_iface buffer to same size as per-interface
c5a64e2 GAS client: Use Protected Dual of Public Action frames with PMF
5ce00d0 GAS server: Add support for Protected Dual of Public Action frames
e24fe94 Add definitions for Protected Dual of Public Action frames
7b2c42f hostapd: Fix PMF robust Action frame processing rules
ea6e040 Clear more configuration parameters to default on FLUSH
cf70d29 wpa_supplicant: Schedule PNO on completion of ongoing sched_scan
080cc44 nl80211: Fix sizeof check in vendor command/event handling
a487b35 hostapd: Fix segmentation fault when calling hostapd_cli all_sta
a6cff8b wpa_supplicant: Fix seg fault in wpas_ctrl_radio_work_flush() in error case
f62a3c2 P2P: Clone dtim_period to a new interface
88a0bca Update copyright years in the manpages
32185f5 Sync manpages and command-line options
b948e78 Add manpage for eapol_test
36bd29e wpa_supplicant: Fix usage text based on build options
dcdd383 P2P: Reduce peer expiration age to 60 sec and allow customization
dd27185 Skip normal scan when PNO is already in progress
a2d6365 P2P: Extend the listen time based on the active concurrent session
Change-Id: Iad81dc478319e59d8cfb673e2988d8bd3099b313
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'wpa_supplicant/main.c')
| -rw-r--r-- | wpa_supplicant/main.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/wpa_supplicant/main.c b/wpa_supplicant/main.c index 37f0c781..d56935d8 100644 --- a/wpa_supplicant/main.c +++ b/wpa_supplicant/main.c @@ -22,13 +22,24 @@ static void usage(void) int i; printf("%s\n\n%s\n" "usage:\n" - " wpa_supplicant [-BddhKLqqstuvW] [-P<pid file>] " + " wpa_supplicant [-BddhKLqq" +#ifdef CONFIG_DEBUG_SYSLOG + "s" +#endif /* CONFIG_DEBUG_SYSLOG */ + "t" +#ifdef CONFIG_DBUS + "u" +#endif /* CONFIG_DBUS */ + "vW] [-P<pid file>] " "[-g<global ctrl>] \\\n" " [-G<group>] \\\n" " -i<ifname> -c<config file> [-C<ctrl>] [-D<driver>] " "[-p<driver_param>] \\\n" - " [-b<br_ifname>] [-f<debug file>] [-e<entropy file>] " - "\\\n" + " [-b<br_ifname>] [-e<entropy file>]" +#ifdef CONFIG_DEBUG_FILE + " [-f<debug file>]" +#endif /* CONFIG_DEBUG_FILE */ + " \\\n" " [-o<override driver>] [-O<override ctrl>] \\\n" " [-N -i<ifname> -c<conf> [-C<ctrl>] " "[-D<driver>] \\\n" |