net/mlx5: fix suffix flow creation in metadata split

[dpdk.git] / drivers / net / tap / tap_netlink.c

diff --git a/drivers/net/tap/tap_netlink.c b/drivers/net/tap/tap_netlink.c
index a10f647..14bbbec 100644 (file)
--- a/drivers/net/tap/tap_netlink.c
+++ b/drivers/net/tap/tap_netlink.c
@@ -1,34 +1,6 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright 2017 6WIND S.A.
- *   Copyright 2017 Mellanox.
- *
- *   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 6WIND S.A. 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 2017 6WIND S.A.
+ * Copyright 2017 Mellanox Technologies, Ltd
  */
 
 #include <errno.h>
@@ -41,6 +13,7 @@
 #include <rte_malloc.h>
 #include <tap_netlink.h>
 #include <rte_random.h>
+#include "tap_log.h"
 
 /* Must be quite large to support dumping a huge list of QDISC or filters. */
 #define BUF_SIZE (32 * 1024) /* Size of the buffer to receive kernel messages */
@@ -73,19 +46,22 @@ tap_nl_init(uint32_t nl_groups)
 
        fd = socket(AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, NETLINK_ROUTE);
        if (fd < 0) {
-               RTE_LOG(ERR, PMD, "Unable to create a netlink socket\n");
+               TAP_LOG(ERR, "Unable to create a netlink socket");
                return -1;
        }
        if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &sndbuf_size, sizeof(int))) {
-               RTE_LOG(ERR, PMD, "Unable to set socket buffer send size\n");
+               TAP_LOG(ERR, "Unable to set socket buffer send size");
+               close(fd);
                return -1;
        }
        if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &rcvbuf_size, sizeof(int))) {
-               RTE_LOG(ERR, PMD, "Unable to set socket buffer receive size\n");
+               TAP_LOG(ERR, "Unable to set socket buffer receive size");
+               close(fd);
                return -1;
        }
        if (bind(fd, (struct sockaddr *)&local, sizeof(local)) < 0) {
-               RTE_LOG(ERR, PMD, "Unable to bind to the netlink socket\n");
+               TAP_LOG(ERR, "Unable to bind to the netlink socket");
+               close(fd);
                return -1;
        }
        return fd;
@@ -104,7 +80,7 @@ int
 tap_nl_final(int nlsk_fd)
 {
        if (close(nlsk_fd)) {
-               RTE_LOG(ERR, PMD, "Failed to close netlink socket: %s (%d)\n",
+               TAP_LOG(ERR, "Failed to close netlink socket: %s (%d)",
                        strerror(errno), errno);
                return -1;
        }
@@ -145,7 +121,7 @@ tap_nl_send(int nlsk_fd, struct nlmsghdr *nh)
        nh->nlmsg_seq = (uint32_t)rte_rand();
        send_bytes = sendmsg(nlsk_fd, &msg, 0);
        if (send_bytes < 0) {
-               RTE_LOG(ERR, PMD, "Failed to send netlink message: %s (%d)\n",
+               TAP_LOG(ERR, "Failed to send netlink message: %s (%d)",
                        strerror(errno), errno);
                return -1;
        }
@@ -328,9 +304,8 @@ tap_nlattr_nested_start(struct nlmsg *msg, uint16_t type)
 
        tail = rte_zmalloc(NULL, sizeof(struct nested_tail), 0);
        if (!tail) {
-               RTE_LOG(ERR, PMD,
-                       "Couldn't allocate memory for nested netlink"
-                       " attribute\n");
+               TAP_LOG(ERR,
+                       "Couldn't allocate memory for nested netlink attribute");
                return -1;
        }