New upstream version 18.02

[deb_dpdk.git] / lib / librte_lpm / rte_lpm6.c

diff --git a/lib/librte_lpm/rte_lpm6.c b/lib/librte_lpm/rte_lpm6.c
index 9cc7be7..149677e 100644 (file)
--- a/lib/librte_lpm/rte_lpm6.c
+++ b/lib/librte_lpm/rte_lpm6.c
@@ -1,41 +1,11 @@
-/*-
- *   BSD LICENSE
- *
- *   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
- *   are met:
- *
- *     * 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
- *       distribution.
- *     * 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
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 #include <string.h>
 #include <stdint.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <errno.h>
 #include <sys/queue.h>
 
 #include <rte_log.h>
@@ -43,7 +13,6 @@
 #include <rte_common.h>
 #include <rte_memory.h>
 #include <rte_malloc.h>
-#include <rte_memzone.h>
 #include <rte_memcpy.h>
 #include <rte_eal.h>
 #include <rte_eal_memconfig.h>
@@ -192,20 +161,22 @@ rte_lpm6_create(const char *name, int socket_id,
        te = rte_zmalloc("LPM6_TAILQ_ENTRY", sizeof(*te), 0);
        if (te == NULL) {
                RTE_LOG(ERR, LPM, "Failed to allocate tailq entry!\n");
+               rte_errno = ENOMEM;
                goto exit;
        }
 
        /* Allocate memory to store the LPM data structures. */
-       lpm = (struct rte_lpm6 *)rte_zmalloc_socket(mem_name, (size_t)mem_size,
+       lpm = rte_zmalloc_socket(mem_name, (size_t)mem_size,
                        RTE_CACHE_LINE_SIZE, socket_id);
 
        if (lpm == NULL) {
                RTE_LOG(ERR, LPM, "LPM memory allocation failed\n");
                rte_free(te);
+               rte_errno = ENOMEM;
                goto exit;
        }
 
-       lpm->rules_tbl = (struct rte_lpm6_rule *)rte_zmalloc_socket(NULL,
+       lpm->rules_tbl = rte_zmalloc_socket(NULL,
                        (size_t)rules_size, RTE_CACHE_LINE_SIZE, socket_id);
 
        if (lpm->rules_tbl == NULL) {
@@ -213,6 +184,7 @@ rte_lpm6_create(const char *name, int socket_id,
                rte_free(lpm);
                lpm = NULL;
                rte_free(te);
+               rte_errno = ENOMEM;
                goto exit;
        }
 
@@ -519,7 +491,7 @@ rte_lpm6_add_v1705(struct rte_lpm6 *lpm, uint8_t *ip, uint8_t depth,
                uint32_t next_hop)
 {
        struct rte_lpm6_tbl_entry *tbl;
-       struct rte_lpm6_tbl_entry *tbl_next;
+       struct rte_lpm6_tbl_entry *tbl_next = NULL;
        int32_t rule_index;
        int status;
        uint8_t masked_ip[RTE_LPM6_IPV6_ADDR_SIZE];