ethdev: add namespace

[dpdk.git] / drivers / net / ixgbe / ixgbe_pf.c

diff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c
index a1529b4..9f1bd0a 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_pf.c
+++ b/drivers/net/ixgbe/ixgbe_pf.c
@@ -104,15 +104,15 @@ int ixgbe_pf_host_init(struct rte_eth_dev *eth_dev)
        memset(uta_info, 0, sizeof(struct ixgbe_uta_info));
        hw->mac.mc_filter_type = 0;
 
-       if (vf_num >= ETH_32_POOLS) {
+       if (vf_num >= RTE_ETH_32_POOLS) {
                nb_queue = 2;
-               RTE_ETH_DEV_SRIOV(eth_dev).active = ETH_64_POOLS;
-       } else if (vf_num >= ETH_16_POOLS) {
+               RTE_ETH_DEV_SRIOV(eth_dev).active = RTE_ETH_64_POOLS;
+       } else if (vf_num >= RTE_ETH_16_POOLS) {
                nb_queue = 4;
-               RTE_ETH_DEV_SRIOV(eth_dev).active = ETH_32_POOLS;
+               RTE_ETH_DEV_SRIOV(eth_dev).active = RTE_ETH_32_POOLS;
        } else {
                nb_queue = 8;
-               RTE_ETH_DEV_SRIOV(eth_dev).active = ETH_16_POOLS;
+               RTE_ETH_DEV_SRIOV(eth_dev).active = RTE_ETH_16_POOLS;
        }
 
        RTE_ETH_DEV_SRIOV(eth_dev).nb_q_per_pool = nb_queue;
@@ -263,15 +263,15 @@ int ixgbe_pf_host_configure(struct rte_eth_dev *eth_dev)
        gpie |= IXGBE_GPIE_MSIX_MODE | IXGBE_GPIE_PBA_SUPPORT;
 
        switch (RTE_ETH_DEV_SRIOV(eth_dev).active) {
-       case ETH_64_POOLS:
+       case RTE_ETH_64_POOLS:
                gcr_ext |= IXGBE_GCR_EXT_VT_MODE_64;
                gpie |= IXGBE_GPIE_VTMODE_64;
                break;
-       case ETH_32_POOLS:
+       case RTE_ETH_32_POOLS:
                gcr_ext |= IXGBE_GCR_EXT_VT_MODE_32;
                gpie |= IXGBE_GPIE_VTMODE_32;
                break;
-       case ETH_16_POOLS:
+       case RTE_ETH_16_POOLS:
                gcr_ext |= IXGBE_GCR_EXT_VT_MODE_16;
                gpie |= IXGBE_GPIE_VTMODE_16;
                break;
@@ -573,8 +573,7 @@ ixgbe_set_vf_lpe(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
                          * if PF has jumbo frames enabled which means legacy
                          * VFs are disabled.
                          */
-                       if (dev->data->dev_conf.rxmode.max_rx_pkt_len >
-                           IXGBE_ETH_MAX_LEN)
+                       if (dev->data->mtu > RTE_ETHER_MTU)
                                break;
                        /* fall through */
                default:
@@ -584,8 +583,7 @@ ixgbe_set_vf_lpe(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
                         * legacy VFs.
                         */
                        if (max_frame > IXGBE_ETH_MAX_LEN ||
-                           dev->data->dev_conf.rxmode.max_rx_pkt_len >
-                           IXGBE_ETH_MAX_LEN)
+                                       dev->data->mtu > RTE_ETHER_MTU)
                                return -1;
                        break;
                }
@@ -599,15 +597,10 @@ ixgbe_set_vf_lpe(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
                   IXGBE_MHADD_MFS_MASK) >> IXGBE_MHADD_MFS_SHIFT;
        if (max_frs < max_frame) {
                hlreg0 = IXGBE_READ_REG(hw, IXGBE_HLREG0);
-               if (max_frame > IXGBE_ETH_MAX_LEN) {
-                       dev->data->dev_conf.rxmode.offloads |=
-                               DEV_RX_OFFLOAD_JUMBO_FRAME;
+               if (max_frame > IXGBE_ETH_MAX_LEN)
                        hlreg0 |= IXGBE_HLREG0_JUMBOEN;
-               } else {
-                       dev->data->dev_conf.rxmode.offloads &=
-                               ~DEV_RX_OFFLOAD_JUMBO_FRAME;
+               else
                        hlreg0 &= ~IXGBE_HLREG0_JUMBOEN;
-               }
                IXGBE_WRITE_REG(hw, IXGBE_HLREG0, hlreg0);
 
                max_frs = max_frame << IXGBE_MHADD_MFS_SHIFT;
@@ -681,29 +674,29 @@ ixgbe_get_vf_queues(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
        /* Notify VF of number of DCB traffic classes */
        eth_conf = &dev->data->dev_conf;
        switch (eth_conf->txmode.mq_mode) {
-       case ETH_MQ_TX_NONE:
-       case ETH_MQ_TX_DCB:
+       case RTE_ETH_MQ_TX_NONE:
+       case RTE_ETH_MQ_TX_DCB:
                PMD_DRV_LOG(ERR, "PF must work with virtualization for VF %u"
                        ", but its tx mode = %d\n", vf,
                        eth_conf->txmode.mq_mode);
                return -1;
 
-       case ETH_MQ_TX_VMDQ_DCB:
+       case RTE_ETH_MQ_TX_VMDQ_DCB:
                vmdq_dcb_tx_conf = &eth_conf->tx_adv_conf.vmdq_dcb_tx_conf;
                switch (vmdq_dcb_tx_conf->nb_queue_pools) {
-               case ETH_16_POOLS:
-                       num_tcs = ETH_8_TCS;
+               case RTE_ETH_16_POOLS:
+                       num_tcs = RTE_ETH_8_TCS;
                        break;
-               case ETH_32_POOLS:
-                       num_tcs = ETH_4_TCS;
+               case RTE_ETH_32_POOLS:
+                       num_tcs = RTE_ETH_4_TCS;
                        break;
                default:
                        return -1;
                }
                break;
 
-       /* ETH_MQ_TX_VMDQ_ONLY,  DCB not enabled */
-       case ETH_MQ_TX_VMDQ_ONLY:
+       /* RTE_ETH_MQ_TX_VMDQ_ONLY,  DCB not enabled */
+       case RTE_ETH_MQ_TX_VMDQ_ONLY:
                hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
                vmvir = IXGBE_READ_REG(hw, IXGBE_VMVIR(vf));
                vlana = vmvir & IXGBE_VMVIR_VLANA_MASK;