replace snprintf with strlcpy

[dpdk.git] / drivers / net / ixgbe / ixgbe_ethdev.c

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 3bf51ee..b1be0c8 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -11,6 +11,7 @@
 #include <stdarg.h>
 #include <inttypes.h>
 #include <netinet/in.h>
+#include <rte_string_fns.h>
 #include <rte_byteorder.h>
 #include <rte_common.h>
 #include <rte_cycles.h>
@@ -1515,6 +1516,7 @@ ixgbevf_negotiate_api(struct ixgbe_hw *hw)
 
        /* start with highest supported, proceed down */
        static const enum ixgbe_pfvf_api_rev sup_ver[] = {
+               ixgbe_mbox_api_13,
                ixgbe_mbox_api_12,
                ixgbe_mbox_api_11,
                ixgbe_mbox_api_10,
@@ -3292,19 +3294,17 @@ static int ixgbe_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,
 
                /* Extended stats from ixgbe_hw_stats */
                for (i = 0; i < IXGBE_NB_HW_STATS; i++) {
-                       snprintf(xstats_names[count].name,
-                               sizeof(xstats_names[count].name),
-                               "%s",
-                               rte_ixgbe_stats_strings[i].name);
+                       strlcpy(xstats_names[count].name,
+                               rte_ixgbe_stats_strings[i].name,
+                               sizeof(xstats_names[count].name));
                        count++;
                }
 
                /* MACsec Stats */
                for (i = 0; i < IXGBE_NB_MACSEC_STATS; i++) {
-                       snprintf(xstats_names[count].name,
-                               sizeof(xstats_names[count].name),
-                               "%s",
-                               rte_ixgbe_macsec_strings[i].name);
+                       strlcpy(xstats_names[count].name,
+                               rte_ixgbe_macsec_strings[i].name,
+                               sizeof(xstats_names[count].name));
                        count++;
                }
 
@@ -3352,19 +3352,17 @@ static int ixgbe_dev_xstats_get_names_by_id(
 
                        /* Extended stats from ixgbe_hw_stats */
                        for (i = 0; i < IXGBE_NB_HW_STATS; i++) {
-                               snprintf(xstats_names[count].name,
-                                       sizeof(xstats_names[count].name),
-                                       "%s",
-                                       rte_ixgbe_stats_strings[i].name);
+                               strlcpy(xstats_names[count].name,
+                                       rte_ixgbe_stats_strings[i].name,
+                                       sizeof(xstats_names[count].name));
                                count++;
                        }
 
                        /* MACsec Stats */
                        for (i = 0; i < IXGBE_NB_MACSEC_STATS; i++) {
-                               snprintf(xstats_names[count].name,
-                                       sizeof(xstats_names[count].name),
-                                       "%s",
-                                       rte_ixgbe_macsec_strings[i].name);
+                               strlcpy(xstats_names[count].name,
+                                       rte_ixgbe_macsec_strings[i].name,
+                                       sizeof(xstats_names[count].name));
                                count++;
                        }
 
@@ -3421,9 +3419,9 @@ static int ixgbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,
 
        if (xstats_names != NULL)
                for (i = 0; i < IXGBEVF_NB_XSTATS; i++)
-                       snprintf(xstats_names[i].name,
-                               sizeof(xstats_names[i].name),
-                               "%s", rte_ixgbevf_stats_strings[i].name);
+                       strlcpy(xstats_names[i].name,
+                               rte_ixgbevf_stats_strings[i].name,
+                               sizeof(xstats_names[i].name));
        return IXGBEVF_NB_XSTATS;
 }
 
@@ -3747,6 +3745,8 @@ ixgbe_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
                dev_info->max_vmdq_pools = ETH_16_POOLS;
        else
                dev_info->max_vmdq_pools = ETH_64_POOLS;
+       dev_info->max_mtu =  dev_info->max_rx_pktlen - IXGBE_ETH_OVERHEAD;
+       dev_info->min_mtu = ETHER_MIN_MTU;
        dev_info->vmdq_queue_num = dev_info->max_rx_queues;
        dev_info->rx_queue_offload_capa = ixgbe_get_rx_queue_offloads(dev);
        dev_info->rx_offload_capa = (ixgbe_get_rx_port_offloads(dev) |
@@ -3854,6 +3854,7 @@ ixgbevf_dev_info_get(struct rte_eth_dev *dev,
        dev_info->max_tx_queues = (uint16_t)hw->mac.max_tx_queues;
        dev_info->min_rx_bufsize = 1024; /* cf BSIZEPACKET in SRRCTL reg */
        dev_info->max_rx_pktlen = 9728; /* includes CRC, cf MAXFRS reg */
+       dev_info->max_mtu = dev_info->max_rx_pktlen - IXGBE_ETH_OVERHEAD;
        dev_info->max_mac_addrs = hw->mac.num_rar_entries;
        dev_info->max_hash_mac_addrs = IXGBE_VMDQ_NUM_UC_MAC;
        dev_info->max_vfs = pci_dev->max_vfs;
@@ -4938,7 +4939,7 @@ ixgbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
        uint32_t maxfrs;
        struct ixgbe_hw *hw;
        struct rte_eth_dev_info dev_info;
-       uint32_t frame_size = mtu + ETHER_HDR_LEN + ETHER_CRC_LEN;
+       uint32_t frame_size = mtu + IXGBE_ETH_OVERHEAD;
        struct rte_eth_dev_data *dev_data = dev->data;
 
        ixgbe_dev_info_get(dev, &dev_info);
@@ -6341,7 +6342,7 @@ static int
 ixgbevf_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
 {
        struct ixgbe_hw *hw;
-       uint32_t max_frame = mtu + ETHER_HDR_LEN + ETHER_CRC_LEN;
+       uint32_t max_frame = mtu + IXGBE_ETH_OVERHEAD;
        struct rte_eth_rxmode *rx_conf = &dev->data->dev_conf.rxmode;
 
        hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);