net: add rte prefix to ether defines

[dpdk.git] / drivers / net / failsafe / failsafe_args.c

diff --git a/drivers/net/failsafe/failsafe_args.c b/drivers/net/failsafe/failsafe_args.c
index a1fb3fa..d2e725b 100644 (file)
--- a/drivers/net/failsafe/failsafe_args.c
+++ b/drivers/net/failsafe/failsafe_args.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 <fcntl.h>
@@ -42,19 +14,18 @@
 #include <rte_devargs.h>
 #include <rte_malloc.h>
 #include <rte_kvargs.h>
+#include <rte_string_fns.h>
 
 #include "failsafe_private.h"
 
-#define DEVARGS_MAXLEN 4096
-
 /* Callback used when a new device is found in devargs */
 typedef int (parse_cb)(struct rte_eth_dev *dev, const char *params,
                uint8_t head);
 
-uint64_t hotplug_poll = FAILSAFE_HOTPLUG_DEFAULT_TIMEOUT_MS;
-int mac_from_arg = 0;
+uint64_t failsafe_hotplug_poll = FAILSAFE_HOTPLUG_DEFAULT_TIMEOUT_MS;
+int failsafe_mac_from_arg;
 
-const char *pmd_failsafe_init_parameters[] = {
+static const char * const pmd_failsafe_init_parameters[] = {
        PMD_FAILSAFE_HOTPLUG_POLL_KVARG,
        PMD_FAILSAFE_MAC_KVARG,
        NULL,
@@ -92,7 +63,7 @@ fs_parse_device(struct sub_device *sdev, char *args)
 
        d = &sdev->devargs;
        DEBUG("%s", args);
-       ret = rte_eal_devargs_parse(args, d);
+       ret = rte_devargs_parse(d, args);
        if (ret) {
                DEBUG("devargs parsing failed with code %d", ret);
                return ret;
@@ -131,7 +102,7 @@ fs_execute_cmd(struct sub_device *sdev, char *cmdline)
                        ERROR("Command line allocation failed");
                        return -ENOMEM;
                }
-               snprintf(sdev->cmdline, len, "%s", cmdline);
+               strlcpy(sdev->cmdline, cmdline, len);
                /* Replace all commas in the command line by spaces */
                for (i = 0; i < len; i++)
                        if (sdev->cmdline[i] == ',')
@@ -370,7 +341,7 @@ fs_remove_sub_devices_definition(char params[DEVARGS_MAXLEN])
                a = b + 1;
        }
 out:
-       snprintf(params, DEVARGS_MAXLEN, "%s", buffer);
+       strlcpy(params, buffer, DEVARGS_MAXLEN);
        return 0;
 }
 
@@ -396,7 +367,7 @@ static int
 fs_get_mac_addr_arg(const char *key __rte_unused,
                const char *value, void *out)
 {
-       struct ether_addr *ea = out;
+       struct rte_ether_addr *ea = out;
        int ret;
 
        if ((value == NULL) || (out == NULL))
@@ -405,7 +376,7 @@ fs_get_mac_addr_arg(const char *key __rte_unused,
                &ea->addr_bytes[0], &ea->addr_bytes[1],
                &ea->addr_bytes[2], &ea->addr_bytes[3],
                &ea->addr_bytes[4], &ea->addr_bytes[5]);
-       return ret != ETHER_ADDR_LEN;
+       return ret != RTE_ETHER_ADDR_LEN;
 }
 
 int
@@ -422,7 +393,7 @@ failsafe_args_parse(struct rte_eth_dev *dev, const char *params)
        ret = 0;
        priv->subs_tx = FAILSAFE_MAX_ETHPORTS;
        /* default parameters */
-       n = snprintf(mut_params, sizeof(mut_params), "%s", params);
+       n = strlcpy(mut_params, params, sizeof(mut_params));
        if (n >= sizeof(mut_params)) {
                ERROR("Parameter string too long (>=%zu)",
                                sizeof(mut_params));
@@ -449,7 +420,7 @@ failsafe_args_parse(struct rte_eth_dev *dev, const char *params)
                if (arg_count == 1) {
                        ret = rte_kvargs_process(kvlist,
                                        PMD_FAILSAFE_HOTPLUG_POLL_KVARG,
-                                       &fs_get_u64_arg, &hotplug_poll);
+                                       &fs_get_u64_arg, &failsafe_hotplug_poll);
                        if (ret < 0)
                                goto free_kvlist;
                }
@@ -464,7 +435,7 @@ failsafe_args_parse(struct rte_eth_dev *dev, const char *params)
                        if (ret < 0)
                                goto free_kvlist;
 
-                       mac_from_arg = 1;
+                       failsafe_mac_from_arg = 1;
                }
        }
        PRIV(dev)->state = DEV_PARSED;