ethdev: add namespace

[dpdk.git] / drivers / net / qede / qede_filter.c

diff --git a/drivers/net/qede/qede_filter.c b/drivers/net/qede/qede_filter.c
index c756594..4404404 100644 (file)
--- a/drivers/net/qede/qede_filter.c
+++ b/drivers/net/qede/qede_filter.c
@@ -20,97 +20,97 @@ const struct _qede_udp_tunn_types {
        const char *string;
 } qede_tunn_types[] = {
        {
-               ETH_TUNNEL_FILTER_OMAC,
+               RTE_ETH_TUNNEL_FILTER_OMAC,
                ECORE_FILTER_MAC,
                ECORE_TUNN_CLSS_MAC_VLAN,
                "outer-mac"
        },
        {
-               ETH_TUNNEL_FILTER_TENID,
+               RTE_ETH_TUNNEL_FILTER_TENID,
                ECORE_FILTER_VNI,
                ECORE_TUNN_CLSS_MAC_VNI,
                "vni"
        },
        {
-               ETH_TUNNEL_FILTER_IMAC,
+               RTE_ETH_TUNNEL_FILTER_IMAC,
                ECORE_FILTER_INNER_MAC,
                ECORE_TUNN_CLSS_INNER_MAC_VLAN,
                "inner-mac"
        },
        {
-               ETH_TUNNEL_FILTER_IVLAN,
+               RTE_ETH_TUNNEL_FILTER_IVLAN,
                ECORE_FILTER_INNER_VLAN,
                ECORE_TUNN_CLSS_INNER_MAC_VLAN,
                "inner-vlan"
        },
        {
-               ETH_TUNNEL_FILTER_OMAC | ETH_TUNNEL_FILTER_TENID,
+               RTE_ETH_TUNNEL_FILTER_OMAC | RTE_ETH_TUNNEL_FILTER_TENID,
                ECORE_FILTER_MAC_VNI_PAIR,
                ECORE_TUNN_CLSS_MAC_VNI,
                "outer-mac and vni"
        },
        {
-               ETH_TUNNEL_FILTER_OMAC | ETH_TUNNEL_FILTER_IMAC,
+               RTE_ETH_TUNNEL_FILTER_OMAC | RTE_ETH_TUNNEL_FILTER_IMAC,
                ECORE_FILTER_UNUSED,
                MAX_ECORE_TUNN_CLSS,
                "outer-mac and inner-mac"
        },
        {
-               ETH_TUNNEL_FILTER_OMAC | ETH_TUNNEL_FILTER_IVLAN,
+               RTE_ETH_TUNNEL_FILTER_OMAC | RTE_ETH_TUNNEL_FILTER_IVLAN,
                ECORE_FILTER_UNUSED,
                MAX_ECORE_TUNN_CLSS,
                "outer-mac and inner-vlan"
        },
        {
-               ETH_TUNNEL_FILTER_TENID | ETH_TUNNEL_FILTER_IMAC,
+               RTE_ETH_TUNNEL_FILTER_TENID | RTE_ETH_TUNNEL_FILTER_IMAC,
                ECORE_FILTER_INNER_MAC_VNI_PAIR,
                ECORE_TUNN_CLSS_INNER_MAC_VNI,
                "vni and inner-mac",
        },
        {
-               ETH_TUNNEL_FILTER_TENID | ETH_TUNNEL_FILTER_IVLAN,
+               RTE_ETH_TUNNEL_FILTER_TENID | RTE_ETH_TUNNEL_FILTER_IVLAN,
                ECORE_FILTER_UNUSED,
                MAX_ECORE_TUNN_CLSS,
                "vni and inner-vlan",
        },
        {
-               ETH_TUNNEL_FILTER_IMAC | ETH_TUNNEL_FILTER_IVLAN,
+               RTE_ETH_TUNNEL_FILTER_IMAC | RTE_ETH_TUNNEL_FILTER_IVLAN,
                ECORE_FILTER_INNER_PAIR,
                ECORE_TUNN_CLSS_INNER_MAC_VLAN,
                "inner-mac and inner-vlan",
        },
        {
-               ETH_TUNNEL_FILTER_OIP,
+               RTE_ETH_TUNNEL_FILTER_OIP,
                ECORE_FILTER_UNUSED,
                MAX_ECORE_TUNN_CLSS,
                "outer-IP"
        },
        {
-               ETH_TUNNEL_FILTER_IIP,
+               RTE_ETH_TUNNEL_FILTER_IIP,
                ECORE_FILTER_UNUSED,
                MAX_ECORE_TUNN_CLSS,
                "inner-IP"
        },
        {
-               RTE_TUNNEL_FILTER_IMAC_IVLAN,
+               RTE_ETH_TUNNEL_FILTER_IMAC_IVLAN,
                ECORE_FILTER_UNUSED,
                MAX_ECORE_TUNN_CLSS,
                "IMAC_IVLAN"
        },
        {
-               RTE_TUNNEL_FILTER_IMAC_IVLAN_TENID,
+               RTE_ETH_TUNNEL_FILTER_IMAC_IVLAN_TENID,
                ECORE_FILTER_UNUSED,
                MAX_ECORE_TUNN_CLSS,
                "IMAC_IVLAN_TENID"
        },
        {
-               RTE_TUNNEL_FILTER_IMAC_TENID,
+               RTE_ETH_TUNNEL_FILTER_IMAC_TENID,
                ECORE_FILTER_UNUSED,
                MAX_ECORE_TUNN_CLSS,
                "IMAC_TENID"
        },
        {
-               RTE_TUNNEL_FILTER_OMAC_TENID_IMAC,
+               RTE_ETH_TUNNEL_FILTER_OMAC_TENID_IMAC,
                ECORE_FILTER_UNUSED,
                MAX_ECORE_TUNN_CLSS,
                "OMAC_TENID_IMAC"
@@ -144,7 +144,7 @@ int qede_check_fdir_support(struct rte_eth_dev *eth_dev)
 {
        struct qede_dev *qdev = QEDE_INIT_QDEV(eth_dev);
        struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
-       struct rte_fdir_conf *fdir = &eth_dev->data->dev_conf.fdir_conf;
+       struct rte_eth_fdir_conf *fdir = &eth_dev->data->dev_conf.fdir_conf;
 
        /* check FDIR modes */
        switch (fdir->mode) {
@@ -542,7 +542,7 @@ qede_udp_dst_port_del(struct rte_eth_dev *eth_dev,
        memset(&tunn, 0, sizeof(tunn));
 
        switch (tunnel_udp->prot_type) {
-       case RTE_TUNNEL_TYPE_VXLAN:
+       case RTE_ETH_TUNNEL_TYPE_VXLAN:
                if (qdev->vxlan.udp_port != tunnel_udp->udp_port) {
                        DP_ERR(edev, "UDP port %u doesn't exist\n",
                                tunnel_udp->udp_port);
@@ -570,7 +570,7 @@ qede_udp_dst_port_del(struct rte_eth_dev *eth_dev,
                                        ECORE_TUNN_CLSS_MAC_VLAN, false);
 
                break;
-       case RTE_TUNNEL_TYPE_GENEVE:
+       case RTE_ETH_TUNNEL_TYPE_GENEVE:
                if (qdev->geneve.udp_port != tunnel_udp->udp_port) {
                        DP_ERR(edev, "UDP port %u doesn't exist\n",
                                tunnel_udp->udp_port);
@@ -622,7 +622,7 @@ qede_udp_dst_port_add(struct rte_eth_dev *eth_dev,
        memset(&tunn, 0, sizeof(tunn));
 
        switch (tunnel_udp->prot_type) {
-       case RTE_TUNNEL_TYPE_VXLAN:
+       case RTE_ETH_TUNNEL_TYPE_VXLAN:
                if (qdev->vxlan.udp_port == tunnel_udp->udp_port) {
                        DP_INFO(edev,
                                "UDP port %u for VXLAN was already configured\n",
@@ -659,7 +659,7 @@ qede_udp_dst_port_add(struct rte_eth_dev *eth_dev,
 
                qdev->vxlan.udp_port = udp_port;
                break;
-       case RTE_TUNNEL_TYPE_GENEVE:
+       case RTE_ETH_TUNNEL_TYPE_GENEVE:
                if (qdev->geneve.udp_port == tunnel_udp->udp_port) {
                        DP_INFO(edev,
                                "UDP port %u for GENEVE was already configured\n",