ethdev: refine API to query supported packet types

[dpdk.git] / lib / librte_ether / rte_ethdev.c

diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index c0d85d6..bd54e1f 100644 (file)
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -866,6 +866,39 @@ rte_eth_dev_tx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
        return 0;
 }
 
+uint32_t
+rte_eth_speed_bitflag(uint32_t speed, int duplex)
+{
+       switch (speed) {
+       case ETH_SPEED_NUM_10M:
+               return duplex ? ETH_LINK_SPEED_10M : ETH_LINK_SPEED_10M_HD;
+       case ETH_SPEED_NUM_100M:
+               return duplex ? ETH_LINK_SPEED_100M : ETH_LINK_SPEED_100M_HD;
+       case ETH_SPEED_NUM_1G:
+               return ETH_LINK_SPEED_1G;
+       case ETH_SPEED_NUM_2_5G:
+               return ETH_LINK_SPEED_2_5G;
+       case ETH_SPEED_NUM_5G:
+               return ETH_LINK_SPEED_5G;
+       case ETH_SPEED_NUM_10G:
+               return ETH_LINK_SPEED_10G;
+       case ETH_SPEED_NUM_20G:
+               return ETH_LINK_SPEED_20G;
+       case ETH_SPEED_NUM_25G:
+               return ETH_LINK_SPEED_25G;
+       case ETH_SPEED_NUM_40G:
+               return ETH_LINK_SPEED_40G;
+       case ETH_SPEED_NUM_50G:
+               return ETH_LINK_SPEED_50G;
+       case ETH_SPEED_NUM_56G:
+               return ETH_LINK_SPEED_56G;
+       case ETH_SPEED_NUM_100G:
+               return ETH_LINK_SPEED_100G;
+       default:
+               return 0;
+       }
+}
+
 int
 rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                      const struct rte_eth_conf *dev_conf)
@@ -901,6 +934,9 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                return -EBUSY;
        }
 
+       /* Copy the dev_conf parameter into the dev structure */
+       memcpy(&dev->data->dev_conf, dev_conf, sizeof(dev->data->dev_conf));
+
        /*
         * Check that the numbers of RX and TX queues are not greater
         * than the maximum number of RX and TX queues supported by the
@@ -925,9 +961,6 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                return -EINVAL;
        }
 
-       /* Copy the dev_conf parameter into the dev structure */
-       memcpy(&dev->data->dev_conf, dev_conf, sizeof(dev->data->dev_conf));
-
        /*
         * If link state interrupt is enabled, check that the
         * device supports it.
@@ -1503,7 +1536,7 @@ rte_eth_xstats_get(uint8_t port_id, struct rte_eth_xstats *xstats,
                        return xcount;
        }
 
-       if (n < count + xcount)
+       if (n < count + xcount || xstats == NULL)
                return count + xcount;
 
        /* now fill the xstats structure */
@@ -1637,8 +1670,7 @@ rte_eth_dev_get_supported_ptypes(uint8_t port_id, uint32_t ptype_mask,
 
        RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
-       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_supported_ptypes_get,
-                               -ENOTSUP);
+       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_supported_ptypes_get, 0);
        all_ptypes = (*dev->dev_ops->dev_supported_ptypes_get)(dev);
 
        if (!all_ptypes)