net/enic: consolidate and remove some defines

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

diff --git a/drivers/net/enic/enic_clsf.c b/drivers/net/enic/enic_clsf.c
index c6fb1a0..e206123 100644 (file)
--- a/drivers/net/enic/enic_clsf.c
+++ b/drivers/net/enic/enic_clsf.c
@@ -55,7 +55,7 @@ void enic_fdir_info_get(struct enic *enic, struct rte_eth_fdir_info *info)
 
 void enic_fdir_info(struct enic *enic)
 {
-       enic->fdir.modes = (u32)RTE_FDIR_MODE_PERFECT;
+       enic->fdir.modes = (uint32_t)RTE_FDIR_MODE_PERFECT;
        enic->fdir.types_mask  = 1 << RTE_ETH_FLOW_NONFRAG_IPV4_UDP |
                                 1 << RTE_ETH_FLOW_NONFRAG_IPV4_TCP;
        if (enic->adv_filters) {
@@ -120,7 +120,7 @@ copy_fltr_v2(struct filter_v2 *fltr, const struct rte_eth_fdir_input *input,
        memset(gp, 0, sizeof(*gp));
 
        if (input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV4_UDP) {
-               struct udp_hdr udp_mask, udp_val;
+               struct rte_udp_hdr udp_mask, udp_val;
                memset(&udp_mask, 0, sizeof(udp_mask));
                memset(&udp_val, 0, sizeof(udp_val));
 
@@ -134,7 +134,7 @@ copy_fltr_v2(struct filter_v2 *fltr, const struct rte_eth_fdir_input *input,
                }
 
                enic_set_layer(gp, FILTER_GENERIC_1_UDP, FILTER_GENERIC_1_L4,
-                              &udp_mask, &udp_val, sizeof(struct udp_hdr));
+                              &udp_mask, &udp_val, sizeof(struct rte_udp_hdr));
        } else if (input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV4_TCP) {
                struct rte_tcp_hdr tcp_mask, tcp_val;
                memset(&tcp_mask, 0, sizeof(tcp_mask));
@@ -216,7 +216,7 @@ copy_fltr_v2(struct filter_v2 *fltr, const struct rte_eth_fdir_input *input,
        }
 
        if (input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV6_UDP) {
-               struct udp_hdr udp_mask, udp_val;
+               struct rte_udp_hdr udp_mask, udp_val;
                memset(&udp_mask, 0, sizeof(udp_mask));
                memset(&udp_val, 0, sizeof(udp_val));
 
@@ -229,7 +229,7 @@ copy_fltr_v2(struct filter_v2 *fltr, const struct rte_eth_fdir_input *input,
                        udp_val.dst_port = input->flow.udp6_flow.dst_port;
                }
                enic_set_layer(gp, FILTER_GENERIC_1_UDP, FILTER_GENERIC_1_L4,
-                              &udp_mask, &udp_val, sizeof(struct udp_hdr));
+                              &udp_mask, &udp_val, sizeof(struct rte_udp_hdr));
        } else if (input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV6_TCP) {
                struct rte_tcp_hdr tcp_mask, tcp_val;
                memset(&tcp_mask, 0, sizeof(tcp_mask));
@@ -337,11 +337,11 @@ int enic_fdir_add_fltr(struct enic *enic, struct rte_eth_fdir_filter *params)
        struct enic_fdir_node *key;
        struct filter_v2 fltr;
        int32_t pos;
-       u8 do_free = 0;
-       u16 old_fltr_id = 0;
-       u32 flowtype_supported;
-       u16 flex_bytes;
-       u16 queue;
+       uint8_t do_free = 0;
+       uint16_t old_fltr_id = 0;
+       uint32_t flowtype_supported;
+       uint16_t flex_bytes;
+       uint16_t queue;
        struct filter_action_v2 action;
 
        memset(&fltr, 0, sizeof(fltr));
@@ -464,7 +464,7 @@ int enic_fdir_add_fltr(struct enic *enic, struct rte_eth_fdir_filter *params)
 
 void enic_clsf_destroy(struct enic *enic)
 {
-       u32 index;
+       uint32_t index;
        struct enic_fdir_node *key;
        /* delete classifier entries */
        for (index = 0; index < ENICPMD_FDIR_MAX; index++) {