Merge branch 'master' of rtime.felk.cvut.cz:frescor/fwp

Conflicts:
	fwp/mngr/fwp_mngr.c

diff --git a/fwp/mngr/fwp_mngr.c b/fwp/mngr/fwp_mngr.c
index 233215ddff03db9b9bae0f8962b36a021507935f..c94328ae063c82f4907b01f912e9794f2203335e 100644 (file)
--- a/fwp/mngr/fwp_mngr.c
+++ b/fwp/mngr/fwp_mngr.c
@@ -115,6 +115,7 @@ usage(void)
        printf("  -b, --bitrate <mbits/s>\n");
        printf("  -o, --ofdm\n");
        printf("  -s, --short-preamble\n");
+       printf("  -h, --help\n");
 }
 
 int main(int argc, char *argv[])
@@ -130,7 +131,7 @@ int main(int argc, char *argv[])
                priv.bypass = true;
 
 
-       while ((opt = getopt_long(argc, argv, "b:l:hos", &long_opts[0], NULL)) != EOF) {
+       while ((opt = getopt_long(argc, argv, "b:d:hl:os", &long_opts[0], NULL)) != EOF) {
                switch (opt) {
                        case 'd':
                                opt_daemon = true;