aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/main.c
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2012-02-11 12:04:12 (GMT)
committerJouni Malinen <j@w1.fi>2012-02-11 17:39:31 (GMT)
commit331f89ff5bee365e1229fc25878791dea52f8d6e (patch)
treed2cb0ce20e1a93391cd91bfad3352c95536ec9d3 /wpa_supplicant/main.c
parent5ea93947ca67ba83529798b806a15b247cdb2e93 (diff)
downloadhostap-331f89ff5bee365e1229fc25878791dea52f8d6e.zip
hostap-331f89ff5bee365e1229fc25878791dea52f8d6e.tar.gz
hostap-331f89ff5bee365e1229fc25878791dea52f8d6e.tar.bz2
Select the BSD license terms as the only license alternative
Simplify licensing terms for hostap.git by selecting the BSD license alternative for any future distribution. This drops the GPL v2 alternative from distribution terms and from contribution requirements. The BSD license alternative that has been used in hostap.git (the one with advertisement clause removed) is compatible with GPL and as such the software in hostap.git can still be used with GPL projects. In addition, any new contribution to hostap.git is expected to be licensed under the BSD terms that allow the changes to be merged into older hostap repositories that still include the GPL v2 alternative. Signed-hostap: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'wpa_supplicant/main.c')
-rw-r--r--wpa_supplicant/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/wpa_supplicant/main.c b/wpa_supplicant/main.c
index e196f3c..0ae1d7d 100644
--- a/wpa_supplicant/main.c
+++ b/wpa_supplicant/main.c
@@ -69,7 +69,7 @@ static void usage(void)
#endif /* CONFIG_DEBUG_SYSLOG */
printf(" -t = include timestamp in debug messages\n"
" -h = show this help text\n"
- " -L = show license (GPL and BSD)\n"
+ " -L = show license (BSD)\n"
" -o = override driver parameter for new interfaces\n"
" -O = override ctrl_interface parameter for new interfaces\n"
" -p = driver parameters\n"