net: add rte prefix to ether defines

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

diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c b/drivers/net/mlx5/mlx5_flow_tcf.c
index fc04c9d..7b9a15e 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow_tcf.c
+++ b/drivers/net/mlx5/mlx5_flow_tcf.c
@@ -402,7 +402,7 @@ struct mlx5_flow_tcf_context {
 struct tcf_neigh_rule {
        LIST_ENTRY(tcf_neigh_rule) next;
        uint32_t refcnt;
-       struct ether_addr eth;
+       struct rte_ether_addr eth;
        uint16_t mask;
        union {
                struct {
@@ -475,8 +475,8 @@ struct flow_tcf_vxlan_encap {
        uint8_t ip_tos;
        uint8_t ip_ttl_hop;
        struct {
-               struct ether_addr dst;
-               struct ether_addr src;
+               struct rte_ether_addr dst;
+               struct rte_ether_addr src;
        } eth;
        union {
                struct {
@@ -689,8 +689,8 @@ flow_tcf_pedit_key_set_mac(const struct rte_flow_action *actions,
 {
        int idx = p_parser->sel.nkeys;
        uint32_t off = actions->type == RTE_FLOW_ACTION_TYPE_SET_MAC_SRC ?
-                                       offsetof(struct ether_hdr, s_addr) :
-                                       offsetof(struct ether_hdr, d_addr);
+                                       offsetof(struct rte_ether_hdr, s_addr) :
+                                       offsetof(struct rte_ether_hdr, d_addr);
        const struct rte_flow_action_set_mac *conf =
                (const struct rte_flow_action_set_mac *)actions->conf;
 
@@ -707,7 +707,7 @@ flow_tcf_pedit_key_set_mac(const struct rte_flow_action *actions,
        p_parser->keys_ex[idx].cmd = TCA_PEDIT_KEY_EX_CMD_SET;
        memcpy(&p_parser->keys[idx].val,
                conf->mac_addr + SZ_PEDIT_KEY_VAL,
-               ETHER_ADDR_LEN - SZ_PEDIT_KEY_VAL);
+               RTE_ETHER_ADDR_LEN - SZ_PEDIT_KEY_VAL);
        p_parser->sel.nkeys = (++idx);
 }
 
@@ -984,11 +984,11 @@ flow_tcf_get_pedit_actions_size(const struct rte_flow_action **actions,
                        flags |= MLX5_FLOW_ACTION_DEC_TTL;
                        break;
                case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC:
-                       keys += NUM_OF_PEDIT_KEYS(ETHER_ADDR_LEN);
+                       keys += NUM_OF_PEDIT_KEYS(RTE_ETHER_ADDR_LEN);
                        flags |= MLX5_FLOW_ACTION_SET_MAC_SRC;
                        break;
                case RTE_FLOW_ACTION_TYPE_SET_MAC_DST:
-                       keys += NUM_OF_PEDIT_KEYS(ETHER_ADDR_LEN);
+                       keys += NUM_OF_PEDIT_KEYS(RTE_ETHER_ADDR_LEN);
                        flags |= MLX5_FLOW_ACTION_SET_MAC_DST;
                        break;
                default:
@@ -2521,7 +2521,7 @@ flow_tcf_get_items_size(const struct rte_flow_attr *attr,
                case RTE_FLOW_ITEM_TYPE_PORT_ID:
                        break;
                case RTE_FLOW_ITEM_TYPE_ETH:
-                       size += SZ_NLATTR_DATA_OF(ETHER_ADDR_LEN) * 4;
+                       size += SZ_NLATTR_DATA_OF(RTE_ETHER_ADDR_LEN) * 4;
                                /* dst/src MAC addr and mask. */
                        break;
                case RTE_FLOW_ITEM_TYPE_VLAN:
@@ -3334,20 +3334,20 @@ flow_tcf_translate(struct rte_eth_dev *dev, struct mlx5_flow *dev_flow,
                                        " parameter is ignored");
                                break;
                        }
-                       if (!is_zero_ether_addr(&mask.eth->dst)) {
+                       if (!rte_is_zero_ether_addr(&mask.eth->dst)) {
                                mnl_attr_put(nlh, TCA_FLOWER_KEY_ETH_DST,
-                                            ETHER_ADDR_LEN,
+                                            RTE_ETHER_ADDR_LEN,
                                             spec.eth->dst.addr_bytes);
                                mnl_attr_put(nlh, TCA_FLOWER_KEY_ETH_DST_MASK,
-                                            ETHER_ADDR_LEN,
+                                            RTE_ETHER_ADDR_LEN,
                                             mask.eth->dst.addr_bytes);
                        }
-                       if (!is_zero_ether_addr(&mask.eth->src)) {
+                       if (!rte_is_zero_ether_addr(&mask.eth->src)) {
                                mnl_attr_put(nlh, TCA_FLOWER_KEY_ETH_SRC,
-                                            ETHER_ADDR_LEN,
+                                            RTE_ETHER_ADDR_LEN,
                                             spec.eth->src.addr_bytes);
                                mnl_attr_put(nlh, TCA_FLOWER_KEY_ETH_SRC_MASK,
-                                            ETHER_ADDR_LEN,
+                                            RTE_ETHER_ADDR_LEN,
                                             mask.eth->src.addr_bytes);
                        }
                        assert(dev_flow->tcf.nlsize >= nlh->nlmsg_len);
@@ -4395,7 +4395,7 @@ flow_tcf_collect_neigh_cb(const struct nlmsghdr *nlh, void *arg)
        /* Neigh rule with permanent attribute found. */
        size = MNL_ALIGN(sizeof(struct nlmsghdr)) +
               MNL_ALIGN(sizeof(struct ndmsg)) +
-              SZ_NLATTR_DATA_OF(ETHER_ADDR_LEN) +
+              SZ_NLATTR_DATA_OF(RTE_ETHER_ADDR_LEN) +
               (family == AF_INET6 ? SZ_NLATTR_DATA_OF(IPV6_ADDR_LEN)
                                   : SZ_NLATTR_TYPE_OF(uint32_t));
        cmd = flow_tcf_alloc_nlcmd(ctx, size);
@@ -4419,7 +4419,7 @@ flow_tcf_collect_neigh_cb(const struct nlmsghdr *nlh, void *arg)
                mnl_attr_put(cmd, NDA_DST, IPV6_ADDR_LEN,
                             mnl_attr_get_payload(na_ip));
        }
-       mnl_attr_put(cmd, NDA_LLADDR, ETHER_ADDR_LEN,
+       mnl_attr_put(cmd, NDA_LLADDR, RTE_ETHER_ADDR_LEN,
                     mnl_attr_get_payload(na_mac));
        assert(size == cmd->nlmsg_len);
        return 1;