net/bnxt: fix packet type

[dpdk.git] / examples / cmdline / commands.c

diff --git a/examples/cmdline/commands.c b/examples/cmdline/commands.c
index 3244780..f3ba247 100644 (file)
--- a/examples/cmdline/commands.c
+++ b/examples/cmdline/commands.c
@@ -1,35 +1,34 @@
 /*-
  *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
+ *
+ *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
- *   Redistribution and use in source and binary forms, with or without 
- *   modification, are permitted provided that the following conditions 
+ *
+ *   Redistribution and use in source and binary forms, with or without
+ *   modification, are permitted provided that the following conditions
  *   are met:
- * 
- *     * Redistributions of source code must retain the above copyright 
+ *
+ *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright 
- *       notice, this list of conditions and the following disclaimer in 
- *       the documentation and/or other materials provided with the 
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
  *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its 
- *       contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Intel Corporation nor the names of its
+ *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
  */
 
 /*
@@ -68,7 +67,11 @@
 #include <netinet/in.h>
 #include <termios.h>
 #ifndef __linux__
-#include <net/socket.h>
+       #ifdef __FreeBSD__
+               #include <sys/socket.h>
+       #else
+               #include <net/socket.h>
+       #endif
 #endif
 
 #include <cmdline_rdline.h>
@@ -131,10 +134,10 @@ static void cmd_obj_del_show_parsed(void *parsed_result,
        char ip_str[INET6_ADDRSTRLEN];
 
        if (res->obj->ip.family == AF_INET)
-               rte_snprintf(ip_str, sizeof(ip_str), NIPQUAD_FMT,
+               snprintf(ip_str, sizeof(ip_str), NIPQUAD_FMT,
                         NIPQUAD(res->obj->ip.addr.ipv4));
        else
-               rte_snprintf(ip_str, sizeof(ip_str), NIP6_FMT,
+               snprintf(ip_str, sizeof(ip_str), NIP6_FMT,
                         NIP6(res->obj->ip.addr.ipv6));
 
        if (strcmp(res->action, "del") == 0) {
@@ -196,15 +199,15 @@ static void cmd_obj_add_parsed(void *parsed_result,
                cmdline_printf(cl, "mem error\n");
                return;
        }
-       rte_snprintf(o->name, sizeof(o->name), "%s", res->name);
+       snprintf(o->name, sizeof(o->name), "%s", res->name);
        o->ip = res->ip;
        SLIST_INSERT_HEAD(&global_obj_list, o, next);
 
        if (o->ip.family == AF_INET)
-               rte_snprintf(ip_str, sizeof(ip_str), NIPQUAD_FMT,
+               snprintf(ip_str, sizeof(ip_str), NIPQUAD_FMT,
                         NIPQUAD(o->ip.addr.ipv4));
        else
-               rte_snprintf(ip_str, sizeof(ip_str), NIP6_FMT,
+               snprintf(ip_str, sizeof(ip_str), NIP6_FMT,
                         NIP6(o->ip.addr.ipv6));
 
        cmdline_printf(cl, "Object %s added, ip=%s\n",
@@ -278,4 +281,3 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_help,
        NULL,
 };
-