diff options
author | Maxim Uvarov <maxim.uvarov@linaro.org> | 2015-08-18 19:05:43 +0300 |
---|---|---|
committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2015-08-18 19:05:43 +0300 |
commit | 6d8b8abf3b3b4ab25f05612e495f25e6945cb617 (patch) | |
tree | 3fac4090b86093ac3146207f5d7c1507e15e328a /example | |
parent | 13297ddfc96397e9c177a8e6bfa2a001bfb767cd (diff) | |
parent | 8658005fb7ab3ae4e2bf6e7619a003a403565b34 (diff) |
Merge branch 'master' into api-next
Diffstat (limited to 'example')
-rw-r--r-- | example/generator/odp_generator.c | 1 | ||||
-rw-r--r-- | example/ipsec/odp_ipsec.c | 1 | ||||
-rw-r--r-- | example/packet/odp_pktio.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 35a6fa8..c1974dc 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -1051,7 +1051,6 @@ static void usage(char *progname) " -h, --help Display help and exit.\n" " environment variables: ODP_PKTIO_DISABLE_SOCKET_MMAP\n" " ODP_PKTIO_DISABLE_SOCKET_MMSG\n" - " ODP_PKTIO_DISABLE_SOCKET_BASIC\n" " can be used to advanced pkt I/O selection for linux-generic\n" "\n", NO_PATH(progname), NO_PATH(progname) ); diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index d392925..85dbc00 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -1590,7 +1590,6 @@ static void usage(char *progname) " -h, --help Display help and exit.\n" " environment variables: ODP_PKTIO_DISABLE_SOCKET_MMAP\n" " ODP_PKTIO_DISABLE_SOCKET_MMSG\n" - " ODP_PKTIO_DISABLE_SOCKET_BASIC\n" " can be used to advanced pkt I/O selection for linux-generic\n" " ODP_IPSEC_USE_POLL_QUEUES\n" " to enable use of poll queues instead of scheduled (default)\n" diff --git a/example/packet/odp_pktio.c b/example/packet/odp_pktio.c index f4574a2..835fb96 100644 --- a/example/packet/odp_pktio.c +++ b/example/packet/odp_pktio.c @@ -695,7 +695,6 @@ static void usage(char *progname) " -h, --help Display help and exit.\n" " environment variables: ODP_PKTIO_DISABLE_SOCKET_MMAP\n" " ODP_PKTIO_DISABLE_SOCKET_MMSG\n" - " ODP_PKTIO_DISABLE_SOCKET_BASIC\n" " can be used to advanced pkt I/O selection for linux-generic\n" "\n", NO_PATH(progname), NO_PATH(progname) ); |