net/ngbe: support MAC filters

[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 3a763f6..d5caaa3 100644 (file)
--- a/drivers/net/octeontx2/otx2_ethdev_ops.c
+++ b/drivers/net/octeontx2/otx2_ethdev_ops.c
@@ -20,21 +20,17 @@ otx2_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu)
        if (dev->configured && otx2_ethdev_is_ptp_en(dev))
                frame_size += NIX_TIMESYNC_RX_OFFSET;
 
-       /* Check if MTU is within the allowed range */
-       if (frame_size < NIX_MIN_FRS || frame_size > NIX_MAX_FRS)
-               return -EINVAL;
-
        buffsz = data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM;
 
        /* Refuse MTU that requires the support of scattered packets
         * when this feature has not been enabled before.
         */
        if (data->dev_started && frame_size > buffsz &&
-           !(dev->rx_offloads & DEV_RX_OFFLOAD_SCATTER))
+           !(dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SCATTER))
                return -EINVAL;
 
        /* Check <seg size> * <max_seg>  >= max_frame */
-       if ((dev->rx_offloads & DEV_RX_OFFLOAD_SCATTER) &&
+       if ((dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SCATTER)     &&
            (frame_size > buffsz * NIX_RX_NB_SEG_MAX))
                return -EINVAL;
 
@@ -59,14 +55,6 @@ otx2_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu)
        if (rc)
                return rc;
 
-       if (frame_size > NIX_L2_MAX_LEN)
-               dev->rx_offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME;
-       else
-               dev->rx_offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME;
-
-       /* Update max_rx_pkt_len */
-       data->dev_conf.rxmode.max_rx_pkt_len = frame_size;
-
        return rc;
 }
 
@@ -75,7 +63,6 @@ otx2_nix_recalc_mtu(struct rte_eth_dev *eth_dev)
 {
        struct rte_eth_dev_data *data = eth_dev->data;
        struct otx2_eth_rxq *rxq;
-       uint16_t mtu;
        int rc;
 
        rxq = data->rx_queues[0];
@@ -83,10 +70,7 @@ otx2_nix_recalc_mtu(struct rte_eth_dev *eth_dev)
        /* Setup scatter mode if needed by jumbo */
        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;
-
-       rc = otx2_nix_mtu_set(eth_dev, mtu);
+       rc = otx2_nix_mtu_set(eth_dev, data->mtu);
        if (rc)
                otx2_err("Failed to set default MTU size %d", rc);
 
@@ -584,17 +568,17 @@ otx2_nix_info_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *devinfo)
        };
 
        /* Auto negotiation disabled */
-       devinfo->speed_capa = ETH_LINK_SPEED_FIXED;
+       devinfo->speed_capa = RTE_ETH_LINK_SPEED_FIXED;
        if (!otx2_dev_is_vf_or_sdp(dev) && !otx2_dev_is_lbk(dev)) {
-               devinfo->speed_capa |= ETH_LINK_SPEED_1G | ETH_LINK_SPEED_10G |
-                       ETH_LINK_SPEED_25G | ETH_LINK_SPEED_40G;
+               devinfo->speed_capa |= RTE_ETH_LINK_SPEED_1G | RTE_ETH_LINK_SPEED_10G |
+                       RTE_ETH_LINK_SPEED_25G | RTE_ETH_LINK_SPEED_40G;
 
                /* 50G and 100G to be supported for board version C0
                 * and above.
                 */
                if (!otx2_dev_is_Ax(dev))
-                       devinfo->speed_capa |= ETH_LINK_SPEED_50G |
-                                              ETH_LINK_SPEED_100G;
+                       devinfo->speed_capa |= RTE_ETH_LINK_SPEED_50G |
+                                              RTE_ETH_LINK_SPEED_100G;
        }
 
        devinfo->dev_capa = RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP |