net/mlx5: fix meter policy flow match item

[dpdk.git] / drivers / net / octeontx2 / otx2_ethdev_ops.c

diff --git a/drivers/net/octeontx2/otx2_ethdev_ops.c b/drivers/net/octeontx2/otx2_ethdev_ops.c
index faecf21..5a45012 100644 (file)
--- a/drivers/net/octeontx2/otx2_ethdev_ops.c
+++ b/drivers/net/octeontx2/otx2_ethdev_ops.c
@@ -58,7 +58,7 @@ otx2_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu)
        if (rc)
                return rc;
 
-       if (frame_size > RTE_ETHER_MAX_LEN)
+       if (frame_size > NIX_L2_MAX_LEN)
                dev->rx_offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME;
        else
                dev->rx_offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME;
@@ -72,22 +72,15 @@ otx2_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu)
 int
 otx2_nix_recalc_mtu(struct rte_eth_dev *eth_dev)
 {
-       struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
        struct rte_eth_dev_data *data = eth_dev->data;
-       struct rte_pktmbuf_pool_private *mbp_priv;
        struct otx2_eth_rxq *rxq;
-       uint32_t buffsz;
        uint16_t mtu;
        int rc;
 
-       /* Get rx buffer size */
        rxq = data->rx_queues[0];
-       mbp_priv = rte_mempool_get_priv(rxq->pool);
-       buffsz = mbp_priv->mbuf_data_room_size - RTE_PKTMBUF_HEADROOM;
 
        /* Setup scatter mode if needed by jumbo */
-       if (data->dev_conf.rxmode.max_rx_pkt_len > buffsz)
-               dev->rx_offloads |= DEV_RX_OFFLOAD_SCATTER;
+       otx2_nix_enable_mseg_on_jumbo(rxq);
 
        /* Setup MTU based on max_rx_pkt_len */
        mtu = data->dev_conf.rxmode.max_rx_pkt_len - NIX_L2_OVERHEAD;
@@ -460,7 +453,7 @@ otx2_nix_fw_version_get(struct rte_eth_dev *eth_dev, char *fw_version,
        rc = strlcpy(fw_version, (char *)dev->mkex_pfl_name, rc);
 
        rc += 1; /* Add the size of '\0' */
-       if (fw_size < (uint32_t)rc)
+       if (fw_size < (size_t)rc)
                return rc;
 
        return 0;
@@ -478,24 +471,11 @@ otx2_nix_pool_ops_supported(struct rte_eth_dev *eth_dev, const char *pool)
 }
 
 int
-otx2_nix_dev_filter_ctrl(struct rte_eth_dev *eth_dev,
-                        enum rte_filter_type filter_type,
-                        enum rte_filter_op filter_op, void *arg)
+otx2_nix_dev_flow_ops_get(struct rte_eth_dev *eth_dev __rte_unused,
+                         const struct rte_flow_ops **ops)
 {
-       RTE_SET_USED(eth_dev);
-
-       if (filter_type != RTE_ETH_FILTER_GENERIC) {
-               otx2_err("Unsupported filter type %d", filter_type);
-               return -ENOTSUP;
-       }
-
-       if (filter_op == RTE_ETH_FILTER_GET) {
-               *(const void **)arg = &otx2_flow_ops;
-               return 0;
-       }
-
-       otx2_err("Invalid filter_op %d", filter_op);
-       return -EINVAL;
+       *ops = &otx2_flow_ops;
+       return 0;
 }
 
 static struct cgx_fw_data *
@@ -540,8 +520,7 @@ otx2_nix_get_module_eeprom(struct rte_eth_dev *eth_dev,
        struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
        struct cgx_fw_data *rsp;
 
-       if (!info->data || !info->length ||
-           (info->offset + info->length > SFP_EEPROM_SIZE))
+       if (info->offset + info->length > SFP_EEPROM_SIZE)
                return -EINVAL;
 
        rsp = nix_get_fwdata(dev);