net: add rte prefix to ether defines

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

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index cf255ca..6a706fd 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1211,13 +1211,13 @@ static int
 flow_dv_convert_encap_data(const struct rte_flow_item *items, uint8_t *buf,
                           size_t *size, struct rte_flow_error *error)
 {
-       struct ether_hdr *eth = NULL;
-       struct vlan_hdr *vlan = NULL;
+       struct rte_ether_hdr *eth = NULL;
+       struct rte_vlan_hdr *vlan = NULL;
        struct ipv4_hdr *ipv4 = NULL;
        struct ipv6_hdr *ipv6 = NULL;
        struct udp_hdr *udp = NULL;
-       struct vxlan_hdr *vxlan = NULL;
-       struct vxlan_gpe_hdr *vxlan_gpe = NULL;
+       struct rte_vxlan_hdr *vxlan = NULL;
+       struct rte_vxlan_gpe_hdr *vxlan_gpe = NULL;
        struct gre_hdr *gre = NULL;
        size_t len;
        size_t temp_size = 0;
@@ -1237,17 +1237,17 @@ flow_dv_convert_encap_data(const struct rte_flow_item *items, uint8_t *buf,
                rte_memcpy((void *)&buf[temp_size], items->spec, len);
                switch (items->type) {
                case RTE_FLOW_ITEM_TYPE_ETH:
-                       eth = (struct ether_hdr *)&buf[temp_size];
+                       eth = (struct rte_ether_hdr *)&buf[temp_size];
                        break;
                case RTE_FLOW_ITEM_TYPE_VLAN:
-                       vlan = (struct vlan_hdr *)&buf[temp_size];
+                       vlan = (struct rte_vlan_hdr *)&buf[temp_size];
                        if (!eth)
                                return rte_flow_error_set(error, EINVAL,
                                                RTE_FLOW_ERROR_TYPE_ACTION,
                                                (void *)items->type,
                                                "eth header not found");
                        if (!eth->ether_type)
-                               eth->ether_type = RTE_BE16(ETHER_TYPE_VLAN);
+                               eth->ether_type = RTE_BE16(RTE_ETHER_TYPE_VLAN);
                        break;
                case RTE_FLOW_ITEM_TYPE_IPV4:
                        ipv4 = (struct ipv4_hdr *)&buf[temp_size];
@@ -1258,9 +1258,9 @@ flow_dv_convert_encap_data(const struct rte_flow_item *items, uint8_t *buf,
                                                "neither eth nor vlan"
                                                " header found");
                        if (vlan && !vlan->eth_proto)
-                               vlan->eth_proto = RTE_BE16(ETHER_TYPE_IPv4);
+                               vlan->eth_proto = RTE_BE16(RTE_ETHER_TYPE_IPv4);
                        else if (eth && !eth->ether_type)
-                               eth->ether_type = RTE_BE16(ETHER_TYPE_IPv4);
+                               eth->ether_type = RTE_BE16(RTE_ETHER_TYPE_IPv4);
                        if (!ipv4->version_ihl)
                                ipv4->version_ihl = MLX5_ENCAP_IPV4_VERSION |
                                                    MLX5_ENCAP_IPV4_IHL_MIN;
@@ -1276,9 +1276,9 @@ flow_dv_convert_encap_data(const struct rte_flow_item *items, uint8_t *buf,
                                                "neither eth nor vlan"
                                                " header found");
                        if (vlan && !vlan->eth_proto)
-                               vlan->eth_proto = RTE_BE16(ETHER_TYPE_IPv6);
+                               vlan->eth_proto = RTE_BE16(RTE_ETHER_TYPE_IPv6);
                        else if (eth && !eth->ether_type)
-                               eth->ether_type = RTE_BE16(ETHER_TYPE_IPv6);
+                               eth->ether_type = RTE_BE16(RTE_ETHER_TYPE_IPv6);
                        if (!ipv6->vtc_flow)
                                ipv6->vtc_flow =
                                        RTE_BE32(MLX5_ENCAP_IPV6_VTC_FLOW);
@@ -1298,7 +1298,7 @@ flow_dv_convert_encap_data(const struct rte_flow_item *items, uint8_t *buf,
                                ipv6->proto = IPPROTO_UDP;
                        break;
                case RTE_FLOW_ITEM_TYPE_VXLAN:
-                       vxlan = (struct vxlan_hdr *)&buf[temp_size];
+                       vxlan = (struct rte_vxlan_hdr *)&buf[temp_size];
                        if (!udp)
                                return rte_flow_error_set(error, EINVAL,
                                                RTE_FLOW_ERROR_TYPE_ACTION,
@@ -1311,7 +1311,7 @@ flow_dv_convert_encap_data(const struct rte_flow_item *items, uint8_t *buf,
                                        RTE_BE32(MLX5_ENCAP_VXLAN_FLAGS);
                        break;
                case RTE_FLOW_ITEM_TYPE_VXLAN_GPE:
-                       vxlan_gpe = (struct vxlan_gpe_hdr *)&buf[temp_size];
+                       vxlan_gpe = (struct rte_vxlan_gpe_hdr *)&buf[temp_size];
                        if (!udp)
                                return rte_flow_error_set(error, EINVAL,
                                                RTE_FLOW_ERROR_TYPE_ACTION,
@@ -3094,7 +3094,7 @@ flow_dv_translate_item_mpls(void *matcher, void *key,
        case MLX5_FLOW_LAYER_GRE:
                MLX5_SET(fte_match_set_misc, misc_m, gre_protocol, 0xffff);
                MLX5_SET(fte_match_set_misc, misc_v, gre_protocol,
-                        ETHER_TYPE_MPLS);
+                        RTE_ETHER_TYPE_MPLS);
                break;
        default:
                MLX5_SET(fte_match_set_lyr_2_4, headers_m, ip_protocol, 0xff);