net: add rte prefix to SCTP structure

[dpdk.git] / drivers / net / enic / enic_flow.c

diff --git a/drivers/net/enic/enic_flow.c b/drivers/net/enic/enic_flow.c
index 9bddfb9..a1582d0 100644 (file)
--- a/drivers/net/enic/enic_flow.c
+++ b/drivers/net/enic/enic_flow.c
@@ -411,7 +411,7 @@ enic_copy_item_ipv4_v1(struct copy_item_args *arg)
        const struct rte_flow_item_ipv4 *spec = item->spec;
        const struct rte_flow_item_ipv4 *mask = item->mask;
        struct filter_ipv4_5tuple *enic_5tup = &enic_filter->u.ipv4;
-       struct ipv4_hdr supported_mask = {
+       struct rte_ipv4_hdr supported_mask = {
                .src_addr = 0xffffffff,
                .dst_addr = 0xffffffff,
        };
@@ -593,7 +593,7 @@ enic_copy_item_inner_vlan_v2(struct copy_item_args *arg)
        arg->l2_proto_off = *off + offsetof(struct rte_vlan_hdr, eth_proto);
        return copy_inner_common(&arg->filter->u.generic_1, off,
                arg->item->spec, mask, sizeof(struct rte_vlan_hdr),
-               eth_type_off, rte_cpu_to_be_16(ETHER_TYPE_VLAN), 2);
+               eth_type_off, rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN), 2);
 }
 
 static int
@@ -606,10 +606,10 @@ enic_copy_item_inner_ipv4_v2(struct copy_item_args *arg)
        if (!mask)
                mask = &rte_flow_item_ipv4_mask;
        /* Append ipv4 header to L5 and set ether type = ipv4 */
-       arg->l3_proto_off = *off + offsetof(struct ipv4_hdr, next_proto_id);
+       arg->l3_proto_off = *off + offsetof(struct rte_ipv4_hdr, next_proto_id);
        return copy_inner_common(&arg->filter->u.generic_1, off,
-               arg->item->spec, mask, sizeof(struct ipv4_hdr),
-               arg->l2_proto_off, rte_cpu_to_be_16(ETHER_TYPE_IPv4), 2);
+               arg->item->spec, mask, sizeof(struct rte_ipv4_hdr),
+               arg->l2_proto_off, rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4), 2);
 }
 
 static int
@@ -622,10 +622,10 @@ enic_copy_item_inner_ipv6_v2(struct copy_item_args *arg)
        if (!mask)
                mask = &rte_flow_item_ipv6_mask;
        /* Append ipv6 header to L5 and set ether type = ipv6 */
-       arg->l3_proto_off = *off + offsetof(struct ipv6_hdr, proto);
+       arg->l3_proto_off = *off + offsetof(struct rte_ipv6_hdr, proto);
        return copy_inner_common(&arg->filter->u.generic_1, off,
-               arg->item->spec, mask, sizeof(struct ipv6_hdr),
-               arg->l2_proto_off, rte_cpu_to_be_16(ETHER_TYPE_IPv6), 2);
+               arg->item->spec, mask, sizeof(struct rte_ipv6_hdr),
+               arg->l2_proto_off, rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6), 2);
 }
 
 static int
@@ -679,14 +679,14 @@ enic_copy_item_eth_v2(struct copy_item_args *arg)
                mask = &rte_flow_item_eth_mask;
 
        memcpy(enic_spec.d_addr.addr_bytes, spec->dst.addr_bytes,
-              ETHER_ADDR_LEN);
+              RTE_ETHER_ADDR_LEN);
        memcpy(enic_spec.s_addr.addr_bytes, spec->src.addr_bytes,
-              ETHER_ADDR_LEN);
+              RTE_ETHER_ADDR_LEN);
 
        memcpy(enic_mask.d_addr.addr_bytes, mask->dst.addr_bytes,
-              ETHER_ADDR_LEN);
+              RTE_ETHER_ADDR_LEN);
        memcpy(enic_mask.s_addr.addr_bytes, mask->src.addr_bytes,
-              ETHER_ADDR_LEN);
+              RTE_ETHER_ADDR_LEN);
        enic_spec.ether_type = spec->type;
        enic_mask.ether_type = mask->type;
 
@@ -773,9 +773,9 @@ enic_copy_item_ipv4_v2(struct copy_item_args *arg)
                mask = &rte_flow_item_ipv4_mask;
 
        memcpy(gp->layer[FILTER_GENERIC_1_L3].mask, &mask->hdr,
-              sizeof(struct ipv4_hdr));
+              sizeof(struct rte_ipv4_hdr));
        memcpy(gp->layer[FILTER_GENERIC_1_L3].val, &spec->hdr,
-              sizeof(struct ipv4_hdr));
+              sizeof(struct rte_ipv4_hdr));
        return 0;
 }
 
@@ -802,9 +802,9 @@ enic_copy_item_ipv6_v2(struct copy_item_args *arg)
                mask = &rte_flow_item_ipv6_mask;
 
        memcpy(gp->layer[FILTER_GENERIC_1_L3].mask, &mask->hdr,
-              sizeof(struct ipv6_hdr));
+              sizeof(struct rte_ipv6_hdr));
        memcpy(gp->layer[FILTER_GENERIC_1_L3].val, &spec->hdr,
-              sizeof(struct ipv6_hdr));
+              sizeof(struct rte_ipv6_hdr));
        return 0;
 }
 
@@ -884,16 +884,16 @@ enic_copy_item_sctp_v2(struct copy_item_args *arg)
         * the protocol number in the IP pattern.
         */
        if (gp->val_flags & FILTER_GENERIC_1_IPV4) {
-               struct ipv4_hdr *ip;
-               ip = (struct ipv4_hdr *)gp->layer[FILTER_GENERIC_1_L3].mask;
+               struct rte_ipv4_hdr *ip;
+               ip = (struct rte_ipv4_hdr *)gp->layer[FILTER_GENERIC_1_L3].mask;
                ip_proto_mask = &ip->next_proto_id;
-               ip = (struct ipv4_hdr *)gp->layer[FILTER_GENERIC_1_L3].val;
+               ip = (struct rte_ipv4_hdr *)gp->layer[FILTER_GENERIC_1_L3].val;
                ip_proto = &ip->next_proto_id;
        } else if (gp->val_flags & FILTER_GENERIC_1_IPV6) {
-               struct ipv6_hdr *ip;
-               ip = (struct ipv6_hdr *)gp->layer[FILTER_GENERIC_1_L3].mask;
+               struct rte_ipv6_hdr *ip;
+               ip = (struct rte_ipv6_hdr *)gp->layer[FILTER_GENERIC_1_L3].mask;
                ip_proto_mask = &ip->proto;
-               ip = (struct ipv6_hdr *)gp->layer[FILTER_GENERIC_1_L3].val;
+               ip = (struct rte_ipv6_hdr *)gp->layer[FILTER_GENERIC_1_L3].val;
                ip_proto = &ip->proto;
        } else {
                /* Need IPv4/IPv6 pattern first */
@@ -910,9 +910,9 @@ enic_copy_item_sctp_v2(struct copy_item_args *arg)
                mask = &rte_flow_item_sctp_mask;
 
        memcpy(gp->layer[FILTER_GENERIC_1_L4].mask, &mask->hdr,
-              sizeof(struct sctp_hdr));
+              sizeof(struct rte_sctp_hdr));
        memcpy(gp->layer[FILTER_GENERIC_1_L4].val, &spec->hdr,
-              sizeof(struct sctp_hdr));
+              sizeof(struct rte_sctp_hdr));
        return 0;
 }