net/bnxt: fix link status when port is stopped

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

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 38fde93..a2d03f9 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -842,6 +842,14 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
                            dev->data->dev_conf.rxmode.offloads;
        bool is_extmem = false;
 
+       if ((offloads & RTE_ETH_RX_OFFLOAD_TCP_LRO) &&
+           !priv->sh->dev_cap.lro_supported) {
+               DRV_LOG(ERR,
+                       "Port %u queue %u LRO is configured but not supported.",
+                       dev->data->port_id, idx);
+               rte_errno = EINVAL;
+               return -rte_errno;
+       }
        if (mp) {
                /*
                 * The parameters should be checked on rte_eth_dev layer.
@@ -2339,13 +2347,12 @@ mlx5_ext_rxq_verify(struct rte_eth_dev *dev)
 bool
 mlx5_rxq_is_hairpin(struct rte_eth_dev *dev, uint16_t idx)
 {
-       struct mlx5_priv *priv = dev->data->dev_private;
        struct mlx5_rxq_ctrl *rxq_ctrl;
 
        if (mlx5_is_external_rxq(dev, idx))
                return false;
        rxq_ctrl = mlx5_rxq_ctrl_get(dev, idx);
-       return (idx < priv->rxqs_n && rxq_ctrl != NULL && rxq_ctrl->is_hairpin);
+       return (rxq_ctrl != NULL && rxq_ctrl->is_hairpin);
 }
 
 /*
@@ -2362,9 +2369,12 @@ mlx5_rxq_is_hairpin(struct rte_eth_dev *dev, uint16_t idx)
 const struct rte_eth_hairpin_conf *
 mlx5_rxq_get_hairpin_conf(struct rte_eth_dev *dev, uint16_t idx)
 {
-       struct mlx5_rxq_priv *rxq = mlx5_rxq_get(dev, idx);
+       if (mlx5_rxq_is_hairpin(dev, idx)) {
+               struct mlx5_rxq_priv *rxq = mlx5_rxq_get(dev, idx);
 
-       return mlx5_rxq_is_hairpin(dev, idx) ? &rxq->hairpin_conf : NULL;
+               return rxq != NULL ? &rxq->hairpin_conf : NULL;
+       }
+       return NULL;
 }
 
 /**
@@ -2374,7 +2384,7 @@ mlx5_rxq_get_hairpin_conf(struct rte_eth_dev *dev, uint16_t idx)
  * @param ind_tbl
  *   Pointer to indirection table to match.
  * @param queues
- *   Queues to match to ques in indirection table.
+ *   Queues to match to queues in indirection table.
  * @param queues_n
  *   Number of queues in the array.
  *
@@ -2383,11 +2393,11 @@ mlx5_rxq_get_hairpin_conf(struct rte_eth_dev *dev, uint16_t idx)
  */
 static int
 mlx5_ind_table_obj_match_queues(const struct mlx5_ind_table_obj *ind_tbl,
-                      const uint16_t *queues, uint32_t queues_n)
+                               const uint16_t *queues, uint32_t queues_n)
 {
-               return (ind_tbl->queues_n == queues_n) &&
-                   (!memcmp(ind_tbl->queues, queues,
-                           ind_tbl->queues_n * sizeof(ind_tbl->queues[0])));
+       return (ind_tbl->queues_n == queues_n) &&
+               (!memcmp(ind_tbl->queues, queues,
+                        ind_tbl->queues_n * sizeof(ind_tbl->queues[0])));
 }
 
 /**