import 15.2.0 Octopus source

[ceph.git] / ceph / src / spdk / dpdk / drivers / net / softnic / rte_eth_softnic_tap.c

diff --git a/ceph/src/spdk/dpdk/drivers/net/softnic/rte_eth_softnic_tap.c b/ceph/src/spdk/dpdk/drivers/net/softnic/rte_eth_softnic_tap.c
index bcc23a9f0b4fa4dde1aa850b88cc1ee642de8ae9..36fe9f028745d354e20c8a9ab7ebb0f46a61d4cd 100644 (file)
--- a/ceph/src/spdk/dpdk/drivers/net/softnic/rte_eth_softnic_tap.c
+++ b/ceph/src/spdk/dpdk/drivers/net/softnic/rte_eth_softnic_tap.c
@@ -3,7 +3,7 @@
  */
 
 #include <netinet/in.h>
-#ifdef RTE_EXEC_ENV_LINUXAPP
+#ifdef RTE_EXEC_ENV_LINUX
 #include <linux/if.h>
 #include <linux/if_tun.h>
 #endif
@@ -60,7 +60,7 @@ softnic_tap_find(struct pmd_internals *p,
        return NULL;
 }
 
-#ifndef RTE_EXEC_ENV_LINUXAPP
+#ifndef RTE_EXEC_ENV_LINUX
 
 struct softnic_tap *
 softnic_tap_create(struct pmd_internals *p __rte_unused,
@@ -91,7 +91,7 @@ softnic_tap_create(struct pmd_internals *p,
 
        memset(&ifr, 0, sizeof(ifr));
        ifr.ifr_flags = IFF_TAP | IFF_NO_PI; /* No packet information */
-       snprintf(ifr.ifr_name, IFNAMSIZ, "%s", name);
+       strlcpy(ifr.ifr_name, name, IFNAMSIZ);
 
        status = ioctl(fd, TUNSETIFF, (void *)&ifr);
        if (status < 0) {