doc: remove reference to pcapng init function

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

diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 70c850a..8520aec 100644 (file)
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -3867,6 +3867,7 @@ rte_eth_dev_rss_reta_update(uint16_t port_id,
                            struct rte_eth_rss_reta_entry64 *reta_conf,
                            uint16_t reta_size)
 {
+       enum rte_eth_rx_mq_mode mq_mode;
        struct rte_eth_dev *dev;
        int ret;
 
@@ -3898,6 +3899,12 @@ rte_eth_dev_rss_reta_update(uint16_t port_id,
        if (ret < 0)
                return ret;
 
+       mq_mode = dev->data->dev_conf.rxmode.mq_mode;
+       if (!(mq_mode & RTE_ETH_MQ_RX_RSS_FLAG)) {
+               RTE_ETHDEV_LOG(ERR, "Multi-queue RSS mode isn't enabled.\n");
+               return -ENOTSUP;
+       }
+
        RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->reta_update, -ENOTSUP);
        return eth_err(port_id, (*dev->dev_ops->reta_update)(dev, reta_conf,
                                                             reta_size));
@@ -3937,6 +3944,7 @@ rte_eth_dev_rss_hash_update(uint16_t port_id,
 {
        struct rte_eth_dev *dev;
        struct rte_eth_dev_info dev_info = { .flow_type_rss_offloads = 0, };
+       enum rte_eth_rx_mq_mode mq_mode;
        int ret;
 
        RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
@@ -3962,6 +3970,13 @@ rte_eth_dev_rss_hash_update(uint16_t port_id,
                        dev_info.flow_type_rss_offloads);
                return -EINVAL;
        }
+
+       mq_mode = dev->data->dev_conf.rxmode.mq_mode;
+       if (!(mq_mode & RTE_ETH_MQ_RX_RSS_FLAG)) {
+               RTE_ETHDEV_LOG(ERR, "Multi-queue RSS mode isn't enabled.\n");
+               return -ENOTSUP;
+       }
+
        RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rss_hash_update, -ENOTSUP);
        return eth_err(port_id, (*dev->dev_ops->rss_hash_update)(dev,
                                                                 rss_conf));
@@ -5631,7 +5646,7 @@ eth_dev_handle_port_info(const char *cmd __rte_unused,
                struct rte_tel_data *d)
 {
        struct rte_tel_data *rxq_state, *txq_state;
-       char mac_addr[RTE_ETHER_ADDR_LEN];
+       char mac_addr[RTE_ETHER_ADDR_FMT_SIZE];
        struct rte_eth_dev *eth_dev;
        char *end_param;
        int port_id, i;
@@ -5672,13 +5687,8 @@ eth_dev_handle_port_info(const char *cmd __rte_unused,
                        eth_dev->data->min_rx_buf_size);
        rte_tel_data_add_dict_int(d, "rx_mbuf_alloc_fail",
                        eth_dev->data->rx_mbuf_alloc_failed);
-       snprintf(mac_addr, RTE_ETHER_ADDR_LEN, "%02x:%02x:%02x:%02x:%02x:%02x",
-                        eth_dev->data->mac_addrs->addr_bytes[0],
-                        eth_dev->data->mac_addrs->addr_bytes[1],
-                        eth_dev->data->mac_addrs->addr_bytes[2],
-                        eth_dev->data->mac_addrs->addr_bytes[3],
-                        eth_dev->data->mac_addrs->addr_bytes[4],
-                        eth_dev->data->mac_addrs->addr_bytes[5]);
+       rte_ether_format_addr(mac_addr, sizeof(mac_addr),
+                       eth_dev->data->mac_addrs);
        rte_tel_data_add_dict_string(d, "mac_addr", mac_addr);
        rte_tel_data_add_dict_int(d, "promiscuous",
                        eth_dev->data->promiscuous);