net/mlx: retrieve mbuf size through proper function

[dpdk.git] / drivers / net / mlx5 / mlx5_ethdev.c

diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index beecc63..47d0862 100644 (file)
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -44,7 +44,6 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <linux/if.h>
 #include <linux/ethtool.h>
 #include <linux/sockios.h>
 #include <fcntl.h>
@@ -398,7 +397,15 @@ priv_get_mtu(struct priv *priv, uint16_t *mtu)
 static int
 priv_set_mtu(struct priv *priv, uint16_t mtu)
 {
-       return priv_set_sysfs_ulong(priv, "mtu", mtu);
+       uint16_t new_mtu;
+
+       if (priv_set_sysfs_ulong(priv, "mtu", mtu) ||
+           priv_get_mtu(priv, &new_mtu))
+               return -1;
+       if (new_mtu == mtu)
+               return 0;
+       errno = EINVAL;
+       return -1;
 }
 
 /**
@@ -566,7 +573,8 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
                        ETH_LINK_SPEED_25G |
                        ETH_LINK_SPEED_40G |
                        ETH_LINK_SPEED_50G |
-                       ETH_LINK_SPEED_56G;
+                       ETH_LINK_SPEED_56G |
+                       ETH_LINK_SPEED_100G;
        priv_unlock(priv);
 }
 
@@ -616,7 +624,7 @@ mlx5_link_update_unlocked(struct rte_eth_dev *dev, int wait_to_complete)
        memset(&dev_link, 0, sizeof(dev_link));
        dev_link.link_status = ((ifr.ifr_flags & IFF_UP) &&
                                (ifr.ifr_flags & IFF_RUNNING));
-       ifr.ifr_data = &edata;
+       ifr.ifr_data = (void *)&edata;
        if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) {
                WARN("ioctl(SIOCETHTOOL, ETHTOOL_GSET) failed: %s",
                     strerror(errno));
@@ -709,6 +717,7 @@ mlx5_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
        /* Reconfigure each RX queue. */
        for (i = 0; (i != priv->rxqs_n); ++i) {
                struct rxq *rxq = (*priv->rxqs)[i];
+               unsigned int mb_len;
                unsigned int max_frame_len;
                int sp;
 
@@ -718,7 +727,9 @@ mlx5_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
                 * toggle scattered support (sp) if necessary. */
                max_frame_len = (priv->mtu + ETHER_HDR_LEN +
                                 (ETHER_MAX_VLAN_FRAME_LEN - ETHER_MAX_LEN));
-               sp = (max_frame_len > (rxq->mb_len - RTE_PKTMBUF_HEADROOM));
+               mb_len = rte_pktmbuf_data_room_size(rxq->mp);
+               assert(mb_len >= RTE_PKTMBUF_HEADROOM);
+               sp = (max_frame_len > (mb_len - RTE_PKTMBUF_HEADROOM));
                /* Provide new values to rxq_setup(). */
                dev->data->dev_conf.rxmode.jumbo_frame = sp;
                dev->data->dev_conf.rxmode.max_rx_pkt_len = max_frame_len;
@@ -766,7 +777,7 @@ mlx5_dev_get_flow_ctrl(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
        if (mlx5_is_secondary())
                return -E_RTE_SECONDARY;
 
-       ifr.ifr_data = &ethpause;
+       ifr.ifr_data = (void *)&ethpause;
        priv_lock(priv);
        if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) {
                ret = errno;
@@ -817,7 +828,7 @@ mlx5_dev_set_flow_ctrl(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
        if (mlx5_is_secondary())
                return -E_RTE_SECONDARY;
 
-       ifr.ifr_data = &ethpause;
+       ifr.ifr_data = (void *)&ethpause;
        ethpause.autoneg = fc_conf->autoneg;
        if (((fc_conf->mode & RTE_FC_FULL) == RTE_FC_FULL) ||
            (fc_conf->mode & RTE_FC_RX_PAUSE))