net/bnxt: fix link status when port is stopped

[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 406761c..05c919e 100644 (file)
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -27,6 +27,7 @@
 #include "mlx5_tx.h"
 #include "mlx5_autoconf.h"
 #include "mlx5_devx.h"
+#include "rte_pmd_mlx5.h"
 
 /**
  * Get the interface index from device name.
@@ -81,9 +82,10 @@ mlx5_dev_configure(struct rte_eth_dev *dev)
                rte_errno = EINVAL;
                return -rte_errno;
        }
-       priv->rss_conf.rss_key =
-               mlx5_realloc(priv->rss_conf.rss_key, MLX5_MEM_RTE,
-                           MLX5_RSS_HASH_KEY_LEN, 0, SOCKET_ID_ANY);
+       priv->rss_conf.rss_key = mlx5_realloc(priv->rss_conf.rss_key,
+                                             MLX5_MEM_RTE,
+                                             MLX5_RSS_HASH_KEY_LEN, 0,
+                                             SOCKET_ID_ANY);
        if (!priv->rss_conf.rss_key) {
                DRV_LOG(ERR, "port %u cannot allocate RSS hash key memory (%u)",
                        dev->data->port_id, rxqs_n);
@@ -109,7 +111,7 @@ mlx5_dev_configure(struct rte_eth_dev *dev)
                                       MLX5_MEM_RTE | MLX5_MEM_ZERO,
                                       sizeof(void *) * rxqs_n, 0,
                                       SOCKET_ID_ANY);
-       if (priv->rxq_privs == NULL) {
+       if (rxqs_n && priv->rxq_privs == NULL) {
                DRV_LOG(ERR, "port %u cannot allocate rxq private data",
                        dev->data->port_id);
                rte_errno = ENOMEM;
@@ -127,6 +129,14 @@ mlx5_dev_configure(struct rte_eth_dev *dev)
                rte_errno = EINVAL;
                return -rte_errno;
        }
+       if (priv->ext_rxqs && rxqs_n >= MLX5_EXTERNAL_RX_QUEUE_ID_MIN) {
+               DRV_LOG(ERR, "port %u cannot handle this many Rx queues (%u), "
+                       "the maximal number of internal Rx queues is %u",
+                       dev->data->port_id, rxqs_n,
+                       MLX5_EXTERNAL_RX_QUEUE_ID_MIN - 1);
+               rte_errno = EINVAL;
+               return -rte_errno;
+       }
        if (rxqs_n != priv->rxqs_n) {
                DRV_LOG(INFO, "port %u Rx queues number update: %u -> %u",
                        dev->data->port_id, priv->rxqs_n, rxqs_n);