net: add rte prefix to ether structures

[dpdk.git] / drivers / net / vdev_netvsc / vdev_netvsc.c

diff --git a/drivers/net/vdev_netvsc/vdev_netvsc.c b/drivers/net/vdev_netvsc/vdev_netvsc.c
index c321a9f..ef02fdc 100644 (file)
--- a/drivers/net/vdev_netvsc/vdev_netvsc.c
+++ b/drivers/net/vdev_netvsc/vdev_netvsc.c
@@ -35,9 +35,11 @@
 #include <rte_hypervisor.h>
 #include <rte_kvargs.h>
 #include <rte_log.h>
+#include <rte_string_fns.h>
 
 #define VDEV_NETVSC_DRIVER net_vdev_netvsc
 #define VDEV_NETVSC_DRIVER_NAME RTE_STR(VDEV_NETVSC_DRIVER)
+#define VDEV_NETVSC_DRIVER_NAME_LEN 15
 #define VDEV_NETVSC_ARG_IFACE "iface"
 #define VDEV_NETVSC_ARG_MAC "mac"
 #define VDEV_NETVSC_ARG_FORCE "force"
@@ -66,7 +68,7 @@ struct vdev_netvsc_ctx {
        char devargs[256];                 /**< Fail-safe device arguments. */
        char if_name[IF_NAMESIZE];         /**< NetVSC netdevice name. */
        unsigned int if_index;             /**< NetVSC netdevice index. */
-       struct ether_addr if_addr;         /**< NetVSC MAC address. */
+       struct rte_ether_addr if_addr;     /**< NetVSC MAC address. */
        int pipe[2];                       /**< Fail-safe communication pipe. */
        char yield[256];                   /**< PCI sub-device arguments. */
 };
@@ -155,7 +157,7 @@ vdev_netvsc_iface_is_netvsc(const struct if_nameindex *iface)
  */
 static int
 vdev_netvsc_foreach_iface(int (*func)(const struct if_nameindex *iface,
-                                     const struct ether_addr *eth_addr,
+                                     const struct rte_ether_addr *eth_addr,
                                      va_list ap), int is_netvsc, ...)
 {
        struct if_nameindex *iface = if_nameindex();
@@ -176,24 +178,21 @@ vdev_netvsc_foreach_iface(int (*func)(const struct if_nameindex *iface,
        for (i = 0; iface[i].if_name; ++i) {
                int is_netvsc_ret;
                struct ifreq req;
-               struct ether_addr eth_addr;
+               struct rte_ether_addr eth_addr;
                va_list ap;
 
                is_netvsc_ret = vdev_netvsc_iface_is_netvsc(&iface[i]) ? 1 : 0;
                if (is_netvsc ^ is_netvsc_ret)
                        continue;
-               strncpy(req.ifr_name, iface[i].if_name, sizeof(req.ifr_name));
+               strlcpy(req.ifr_name, iface[i].if_name, sizeof(req.ifr_name));
                if (ioctl(s, SIOCGIFHWADDR, &req) == -1) {
                        DRV_LOG(WARNING, "cannot retrieve information about"
                                         " interface \"%s\": %s",
                                         req.ifr_name, rte_strerror(errno));
                        continue;
                }
-               if (req.ifr_hwaddr.sa_family != ARPHRD_ETHER) {
-                       DRV_LOG(DEBUG, "interface %s is non-ethernet device",
-                               req.ifr_name);
+               if (req.ifr_hwaddr.sa_family != ARPHRD_ETHER)
                        continue;
-               }
                memcpy(eth_addr.addr_bytes, req.ifr_hwaddr.sa_data,
                       RTE_DIM(eth_addr.addr_bytes));
                va_start(ap, is_netvsc);
@@ -327,12 +326,15 @@ static int
 vdev_netvsc_sysfs_readlink(char *buf, size_t size, const char *if_name,
                           const char *relpath)
 {
+       struct vdev_netvsc_ctx *ctx;
+       char in[RTE_MAX(sizeof(ctx->yield), 256u)];
        int ret;
 
-       ret = snprintf(buf, size, "/sys/class/net/%s/%s", if_name, relpath);
-       if (ret == -1 || (size_t)ret >= size)
+       ret = snprintf(in, sizeof(in) - 1, "/sys/class/net/%s/%s",
+                      if_name, relpath);
+       if (ret == -1 || (size_t)ret >= sizeof(in))
                return -ENOBUFS;
-       ret = readlink(buf, buf, size);
+       ret = readlink(in, buf, size);
        if (ret == -1)
                return -errno;
        if ((size_t)ret >= size - 1)
@@ -366,7 +368,7 @@ vdev_netvsc_sysfs_readlink(char *buf, size_t size, const char *if_name,
  */
 static int
 vdev_netvsc_device_probe(const struct if_nameindex *iface,
-                   const struct ether_addr *eth_addr,
+                   const struct rte_ether_addr *eth_addr,
                    va_list ap)
 {
        struct vdev_netvsc_ctx *ctx = va_arg(ap, struct vdev_netvsc_ctx *);
@@ -382,7 +384,7 @@ vdev_netvsc_device_probe(const struct if_nameindex *iface,
                DRV_LOG(DEBUG,
                        "NetVSC interface \"%s\" (index %u) renamed \"%s\"",
                        ctx->if_name, ctx->if_index, iface->if_name);
-               strncpy(ctx->if_name, iface->if_name, sizeof(ctx->if_name));
+               strlcpy(ctx->if_name, iface->if_name, sizeof(ctx->if_name));
                return 0;
        }
        if (!is_same_ether_addr(eth_addr, &ctx->if_addr))
@@ -505,7 +507,7 @@ vdev_netvsc_alarm(__rte_unused void *arg)
  */
 static int
 vdev_netvsc_netvsc_probe(const struct if_nameindex *iface,
-                        const struct ether_addr *eth_addr,
+                        const struct rte_ether_addr *eth_addr,
                         va_list ap)
 {
        const char *name = va_arg(ap, const char *);
@@ -525,7 +527,7 @@ vdev_netvsc_netvsc_probe(const struct if_nameindex *iface,
                                if (!strcmp(pair->value, iface->if_name))
                                        break;
                        } else if (!strcmp(pair->key, VDEV_NETVSC_ARG_MAC)) {
-                               struct ether_addr tmp;
+                               struct rte_ether_addr tmp;
 
                                if (sscanf(pair->value,
                                           "%" SCNx8 ":%" SCNx8 ":%" SCNx8 ":"
@@ -580,7 +582,7 @@ vdev_netvsc_netvsc_probe(const struct if_nameindex *iface,
                goto error;
        }
        ctx->id = vdev_netvsc_ctx_count;
-       strncpy(ctx->if_name, iface->if_name, sizeof(ctx->if_name));
+       strlcpy(ctx->if_name, iface->if_name, sizeof(ctx->if_name));
        ctx->if_index = iface->if_index;
        ctx->if_addr = *eth_addr;
        ctx->pipe[0] = -1;
@@ -784,7 +786,7 @@ RTE_PMD_REGISTER_PARAM_STRING(net_vdev_netvsc,
 /** Initialize driver log type. */
 RTE_INIT(vdev_netvsc_init_log)
 {
-       vdev_netvsc_logtype = rte_log_register("pmd.vdev_netvsc");
+       vdev_netvsc_logtype = rte_log_register("pmd.net.vdev_netvsc");
        if (vdev_netvsc_logtype >= 0)
                rte_log_set_level(vdev_netvsc_logtype, RTE_LOG_NOTICE);
 }
@@ -794,7 +796,8 @@ static int
 vdev_netvsc_cmp_rte_device(const struct rte_device *dev1,
                           __rte_unused const void *_dev2)
 {
-       return strcmp(dev1->devargs->name, VDEV_NETVSC_DRIVER_NAME);
+       return strncmp(dev1->devargs->name, VDEV_NETVSC_DRIVER_NAME,
+                      VDEV_NETVSC_DRIVER_NAME_LEN);
 }
 
 /**
@@ -805,15 +808,17 @@ vdev_netvsc_cmp_rte_device(const struct rte_device *dev1,
 static void
 vdev_netvsc_scan_callback(__rte_unused void *arg)
 {
-       struct rte_vdev_device *dev;
+       struct rte_device *dev;
        struct rte_devargs *devargs;
        struct rte_bus *vbus = rte_bus_find_by_name("vdev");
 
        RTE_EAL_DEVARGS_FOREACH("vdev", devargs)
-               if (!strcmp(devargs->name, VDEV_NETVSC_DRIVER_NAME))
+               if (!strncmp(devargs->name, VDEV_NETVSC_DRIVER_NAME,
+                            VDEV_NETVSC_DRIVER_NAME_LEN))
                        return;
-       dev = (struct rte_vdev_device *)vbus->find_device(NULL,
-               vdev_netvsc_cmp_rte_device, VDEV_NETVSC_DRIVER_NAME);
+
+       dev = vbus->find_device(NULL, vdev_netvsc_cmp_rte_device,
+                               VDEV_NETVSC_DRIVER_NAME);
        if (dev)
                return;
        if (rte_devargs_add(RTE_DEVTYPE_VIRTUAL, VDEV_NETVSC_DRIVER_NAME))