route/link/vxlan: trivial rename VXLAN_HAS_ prefix and vxi_mask

Global search and replace of VXLAN_HAS_ for VXLAN_ATTR_
and vxi_mask for ce_mask. Preparation step for using ATTR_DIFF
infrastructure in a vxlan_compare.

Signed-off-by: Balki Raman <ramanb@cumulusnetworks.com>
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
[thaller@redhat.com: rebased patch and changed whitespace]
Signed-off-by: Thomas Haller <thaller@redhat.com>

diff --git a/lib/route/link/vxlan.c b/lib/route/link/vxlan.c
index 184373e34296184413eef582bef08e9e7dfca421..60857fc59a696d554fdb07e2cc0463b25768d32e 100644 (file)
--- a/lib/route/link/vxlan.c
+++ b/lib/route/link/vxlan.c
@@ -34,22 +34,22 @@
 #include <linux/if_link.h>
 
 /** @cond SKIP */
-#define VXLAN_HAS_ID   (1<<0)
-#define VXLAN_HAS_GROUP        (1<<1)
-#define VXLAN_HAS_LINK (1<<2)
-#define VXLAN_HAS_LOCAL        (1<<3)
-#define VXLAN_HAS_TTL  (1<<4)
-#define VXLAN_HAS_TOS  (1<<5)
-#define VXLAN_HAS_LEARNING     (1<<6)
-#define VXLAN_HAS_AGEING       (1<<7)
-#define VXLAN_HAS_LIMIT                (1<<8)
-#define VXLAN_HAS_PORT_RANGE   (1<<9)
-#define VXLAN_HAS_PROXY        (1<<10)
-#define VXLAN_HAS_RSC  (1<<11)
-#define VXLAN_HAS_L2MISS       (1<<12)
-#define VXLAN_HAS_L3MISS       (1<<13)
-#define VXLAN_HAS_GROUP6       (1<<14)
-#define VXLAN_HAS_LOCAL6       (1<<15)
+#define VXLAN_ATTR_ID           (1<<0)
+#define VXLAN_ATTR_GROUP        (1<<1)
+#define VXLAN_ATTR_LINK         (1<<2)
+#define VXLAN_ATTR_LOCAL        (1<<3)
+#define VXLAN_ATTR_TTL          (1<<4)
+#define VXLAN_ATTR_TOS          (1<<5)
+#define VXLAN_ATTR_LEARNING     (1<<6)
+#define VXLAN_ATTR_AGEING       (1<<7)
+#define VXLAN_ATTR_LIMIT        (1<<8)
+#define VXLAN_ATTR_PORT_RANGE   (1<<9)
+#define VXLAN_ATTR_PROXY        (1<<10)
+#define VXLAN_ATTR_RSC          (1<<11)
+#define VXLAN_ATTR_L2MISS       (1<<12)
+#define VXLAN_ATTR_L3MISS       (1<<13)
+#define VXLAN_ATTR_GROUP6       (1<<14)
+#define VXLAN_ATTR_LOCAL6       (1<<15)
 
 struct vxlan_info
 {
@@ -69,7 +69,7 @@ struct vxlan_info
        uint8_t                 vxi_rsc;
        uint8_t                 vxi_l2miss;
        uint8_t                 vxi_l3miss;
-       uint32_t                vxi_mask;
+       uint32_t                ce_mask;
 };
 
 /** @endcond */
@@ -128,89 +128,89 @@ static int vxlan_parse(struct rtnl_link *link, struct nlattr *data,
 
        if (tb[IFLA_VXLAN_ID]) {
                vxi->vxi_id = nla_get_u32(tb[IFLA_VXLAN_ID]);
-               vxi->vxi_mask |= VXLAN_HAS_ID;
+               vxi->ce_mask |= VXLAN_ATTR_ID;
        }
 
        if (tb[IFLA_VXLAN_GROUP6]) {
                nla_memcpy(&vxi->vxi_group6, tb[IFLA_VXLAN_GROUP6],
                           sizeof(vxi->vxi_group6));
-               vxi->vxi_mask |= VXLAN_HAS_GROUP6;
+               vxi->ce_mask |= VXLAN_ATTR_GROUP6;
        }
 
        if (tb[IFLA_VXLAN_GROUP]) {
                nla_memcpy(&vxi->vxi_group, tb[IFLA_VXLAN_GROUP],
                                   sizeof(vxi->vxi_group));
-               vxi->vxi_mask |= VXLAN_HAS_GROUP;
-               vxi->vxi_mask &= ~VXLAN_HAS_GROUP6;
+               vxi->ce_mask |= VXLAN_ATTR_GROUP;
+               vxi->ce_mask &= ~VXLAN_ATTR_GROUP6;
        }
 
        if (tb[IFLA_VXLAN_LINK]) {
                vxi->vxi_link = nla_get_u32(tb[IFLA_VXLAN_LINK]);
-               vxi->vxi_mask |= VXLAN_HAS_LINK;
+               vxi->ce_mask |= VXLAN_ATTR_LINK;
        }
 
        if (tb[IFLA_VXLAN_LOCAL6]) {
                nla_memcpy(&vxi->vxi_local6, tb[IFLA_VXLAN_LOCAL6],
                           sizeof(vxi->vxi_local6));
-               vxi->vxi_mask |= VXLAN_HAS_LOCAL6;
+               vxi->ce_mask |= VXLAN_ATTR_LOCAL6;
        }
 
        if (tb[IFLA_VXLAN_LOCAL]) {
                nla_memcpy(&vxi->vxi_local, tb[IFLA_VXLAN_LOCAL],
                                   sizeof(vxi->vxi_local));
-               vxi->vxi_mask |= VXLAN_HAS_LOCAL;
-               vxi->vxi_mask &= ~VXLAN_HAS_LOCAL6;
+               vxi->ce_mask |= VXLAN_ATTR_LOCAL;
+               vxi->ce_mask &= ~VXLAN_ATTR_LOCAL6;
        }
 
        if (tb[IFLA_VXLAN_TTL]) {
                vxi->vxi_ttl = nla_get_u8(tb[IFLA_VXLAN_TTL]);
-               vxi->vxi_mask |= VXLAN_HAS_TTL;
+               vxi->ce_mask |= VXLAN_ATTR_TTL;
        }
 
        if (tb[IFLA_VXLAN_TOS]) {
                vxi->vxi_tos = nla_get_u8(tb[IFLA_VXLAN_TOS]);
-               vxi->vxi_mask |= VXLAN_HAS_TOS;
+               vxi->ce_mask |= VXLAN_ATTR_TOS;
        }
 
        if (tb[IFLA_VXLAN_LEARNING]) {
                vxi->vxi_learning = nla_get_u8(tb[IFLA_VXLAN_LEARNING]);
-               vxi->vxi_mask |= VXLAN_HAS_LEARNING;
+               vxi->ce_mask |= VXLAN_ATTR_LEARNING;
        }
 
        if (tb[IFLA_VXLAN_AGEING]) {
                vxi->vxi_ageing = nla_get_u32(tb[IFLA_VXLAN_AGEING]);
-               vxi->vxi_mask |= VXLAN_HAS_AGEING;
+               vxi->ce_mask |= VXLAN_ATTR_AGEING;
        }
 
        if (tb[IFLA_VXLAN_LIMIT]) {
                vxi->vxi_limit = nla_get_u32(tb[IFLA_VXLAN_LIMIT]);
-               vxi->vxi_mask |= VXLAN_HAS_LIMIT;
+               vxi->ce_mask |= VXLAN_ATTR_LIMIT;
        }
 
        if (tb[IFLA_VXLAN_PORT_RANGE]) {
                nla_memcpy(&vxi->vxi_port_range, tb[IFLA_VXLAN_PORT_RANGE],
                                   sizeof(vxi->vxi_port_range));
-               vxi->vxi_mask |= VXLAN_HAS_PORT_RANGE;
+               vxi->ce_mask |= VXLAN_ATTR_PORT_RANGE;
        }
 
        if (tb[IFLA_VXLAN_PROXY]) {
                vxi->vxi_proxy = nla_get_u8(tb[IFLA_VXLAN_PROXY]);
-               vxi->vxi_mask |= VXLAN_HAS_PROXY;
+               vxi->ce_mask |= VXLAN_ATTR_PROXY;
        }
 
        if (tb[IFLA_VXLAN_RSC]) {
                vxi->vxi_rsc = nla_get_u8(tb[IFLA_VXLAN_RSC]);
-               vxi->vxi_mask |= VXLAN_HAS_RSC;
+               vxi->ce_mask |= VXLAN_ATTR_RSC;
        }
 
        if (tb[IFLA_VXLAN_L2MISS]) {
                vxi->vxi_l2miss = nla_get_u8(tb[IFLA_VXLAN_L2MISS]);
-               vxi->vxi_mask |= VXLAN_HAS_L2MISS;
+               vxi->ce_mask |= VXLAN_ATTR_L2MISS;
        }
 
        if (tb[IFLA_VXLAN_L3MISS]) {
                vxi->vxi_l3miss = nla_get_u8(tb[IFLA_VXLAN_L3MISS]);
-               vxi->vxi_mask |= VXLAN_HAS_L3MISS;
+               vxi->ce_mask |= VXLAN_ATTR_L3MISS;
        }
 
        err = 0;
@@ -242,13 +242,13 @@ static void vxlan_dump_details(struct rtnl_link *link, struct nl_dump_params *p)
 
        nl_dump_line(p, "    vxlan-id %u\n", vxi->vxi_id);
 
-       if (vxi->vxi_mask & VXLAN_HAS_GROUP) {
+       if (vxi->ce_mask & VXLAN_ATTR_GROUP) {
                nl_dump(p, "      group ");
                if (inet_ntop(AF_INET, &vxi->vxi_group, addr, sizeof(addr)))
                        nl_dump_line(p, "%s\n", addr);
                else
                        nl_dump_line(p, "%#x\n", ntohs(vxi->vxi_group));
-       } else if (vxi->vxi_mask & VXLAN_HAS_GROUP6) {
+       } else if (vxi->ce_mask & VXLAN_ATTR_GROUP6) {
                nl_dump(p, "      group ");
                if (inet_ntop(AF_INET6, &vxi->vxi_group6, addr, sizeof(addr)))
                        nl_dump_line(p, "%s\n", addr);
@@ -256,7 +256,7 @@ static void vxlan_dump_details(struct rtnl_link *link, struct nl_dump_params *p)
                        nl_dump_line(p, "%#x\n", vxi->vxi_group6);
        }
 
-       if (vxi->vxi_mask & VXLAN_HAS_LINK) {
+       if (vxi->ce_mask & VXLAN_ATTR_LINK) {
                nl_dump(p, "      link ");
 
                name = NULL;
@@ -270,13 +270,13 @@ static void vxlan_dump_details(struct rtnl_link *link, struct nl_dump_params *p)
                        nl_dump_line(p, "%u\n", vxi->vxi_link);
        }
 
-       if (vxi->vxi_mask & VXLAN_HAS_LOCAL) {
+       if (vxi->ce_mask & VXLAN_ATTR_LOCAL) {
                nl_dump(p, "      local ");
                if (inet_ntop(AF_INET, &vxi->vxi_local, addr, sizeof(addr)))
                        nl_dump_line(p, "%s\n", addr);
                else
                        nl_dump_line(p, "%#x\n", ntohs(vxi->vxi_local));
-       } else if (vxi->vxi_mask & VXLAN_HAS_LOCAL6) {
+       } else if (vxi->ce_mask & VXLAN_ATTR_LOCAL6) {
                nl_dump(p, "      local ");
                if (inet_ntop(AF_INET6, &vxi->vxi_local6, addr, sizeof(addr)))
                        nl_dump_line(p, "%s\n", addr);
@@ -285,7 +285,7 @@ static void vxlan_dump_details(struct rtnl_link *link, struct nl_dump_params *p)
        }
 
 
-       if (vxi->vxi_mask & VXLAN_HAS_TTL) {
+       if (vxi->ce_mask & VXLAN_ATTR_TTL) {
                nl_dump(p, "      ttl ");
                if(vxi->vxi_ttl)
                        nl_dump_line(p, "%u\n", vxi->vxi_ttl);
@@ -293,7 +293,7 @@ static void vxlan_dump_details(struct rtnl_link *link, struct nl_dump_params *p)
                        nl_dump_line(p, "inherit\n");
        }
 
-       if (vxi->vxi_mask & VXLAN_HAS_TOS) {
+       if (vxi->ce_mask & VXLAN_ATTR_TOS) {
                nl_dump(p, "      tos ");
                if (vxi->vxi_tos == 1)
                        nl_dump_line(p, "inherit\n", vxi->vxi_tos);
@@ -301,7 +301,7 @@ static void vxlan_dump_details(struct rtnl_link *link, struct nl_dump_params *p)
                        nl_dump_line(p, "%#x\n", vxi->vxi_tos);
        }
 
-       if (vxi->vxi_mask & VXLAN_HAS_LEARNING) {
+       if (vxi->ce_mask & VXLAN_ATTR_LEARNING) {
                nl_dump(p, "      learning ");
                if (vxi->vxi_learning)
                        nl_dump_line(p, "enabled (%#x)\n", vxi->vxi_learning);
@@ -309,7 +309,7 @@ static void vxlan_dump_details(struct rtnl_link *link, struct nl_dump_params *p)
                        nl_dump_line(p, "disabled\n");
        }
 
-       if (vxi->vxi_mask & VXLAN_HAS_AGEING) {
+       if (vxi->ce_mask & VXLAN_ATTR_AGEING) {
                nl_dump(p, "      ageing ");
                if (vxi->vxi_ageing)
                        nl_dump_line(p, "%u seconds\n", vxi->vxi_ageing);
@@ -317,7 +317,7 @@ static void vxlan_dump_details(struct rtnl_link *link, struct nl_dump_params *p)
                        nl_dump_line(p, "disabled\n");
        }
 
-       if (vxi->vxi_mask & VXLAN_HAS_LIMIT) {
+       if (vxi->ce_mask & VXLAN_ATTR_LIMIT) {
                nl_dump(p, "      limit ");
                if (vxi->vxi_limit)
                        nl_dump_line(p, "%u\n", vxi->vxi_limit);
@@ -325,12 +325,12 @@ static void vxlan_dump_details(struct rtnl_link *link, struct nl_dump_params *p)
                        nl_dump_line(p, "unlimited\n");
        }
 
-       if (vxi->vxi_mask & VXLAN_HAS_PORT_RANGE)
+       if (vxi->ce_mask & VXLAN_ATTR_PORT_RANGE)
                nl_dump_line(p, "      port range %u - %u\n",
                                         ntohs(vxi->vxi_port_range.low),
                                         ntohs(vxi->vxi_port_range.high));
 
-       if (vxi->vxi_mask & VXLAN_HAS_PROXY) {
+       if (vxi->ce_mask & VXLAN_ATTR_PROXY) {
                nl_dump(p, "      proxy ");
                if (vxi->vxi_proxy)
                        nl_dump_line(p, "enabled (%#x)\n", vxi->vxi_proxy);
@@ -338,7 +338,7 @@ static void vxlan_dump_details(struct rtnl_link *link, struct nl_dump_params *p)
                        nl_dump_line(p, "disabled\n");
        }
 
-       if (vxi->vxi_mask & VXLAN_HAS_RSC) {
+       if (vxi->ce_mask & VXLAN_ATTR_RSC) {
                nl_dump(p, "      rsc ");
                if (vxi->vxi_rsc)
                        nl_dump_line(p, "enabled (%#x)\n", vxi->vxi_rsc);
@@ -346,7 +346,7 @@ static void vxlan_dump_details(struct rtnl_link *link, struct nl_dump_params *p)
                        nl_dump_line(p, "disabled\n");
        }
 
-       if (vxi->vxi_mask & VXLAN_HAS_L2MISS) {
+       if (vxi->ce_mask & VXLAN_ATTR_L2MISS) {
                nl_dump(p, "      l2miss ");
                if (vxi->vxi_l2miss)
                        nl_dump_line(p, "enabled (%#x)\n", vxi->vxi_l2miss);
@@ -354,7 +354,7 @@ static void vxlan_dump_details(struct rtnl_link *link, struct nl_dump_params *p)
                        nl_dump_line(p, "disabled\n");
        }
 
-       if (vxi->vxi_mask & VXLAN_HAS_L3MISS) {
+       if (vxi->ce_mask & VXLAN_ATTR_L3MISS) {
                nl_dump(p, "      l3miss ");
                if (vxi->vxi_l3miss)
                        nl_dump_line(p, "enabled (%#x)\n", vxi->vxi_l3miss);
@@ -389,53 +389,53 @@ static int vxlan_put_attrs(struct nl_msg *msg, struct rtnl_link *link)
        if (!(data = nla_nest_start(msg, IFLA_INFO_DATA)))
                return -NLE_MSGSIZE;
 
-       if (vxi->vxi_mask & VXLAN_HAS_ID)
+       if (vxi->ce_mask & VXLAN_ATTR_ID)
                NLA_PUT_U32(msg, IFLA_VXLAN_ID, vxi->vxi_id);
 
-       if (vxi->vxi_mask & VXLAN_HAS_GROUP)
+       if (vxi->ce_mask & VXLAN_ATTR_GROUP)
                NLA_PUT(msg, IFLA_VXLAN_GROUP, sizeof(vxi->vxi_group), &vxi->vxi_group);
 
-       if (vxi->vxi_mask & VXLAN_HAS_GROUP6)
+       if (vxi->ce_mask & VXLAN_ATTR_GROUP6)
                NLA_PUT(msg, IFLA_VXLAN_GROUP6, sizeof(vxi->vxi_group6), &vxi->vxi_group6);
 
-       if (vxi->vxi_mask & VXLAN_HAS_LINK)
+       if (vxi->ce_mask & VXLAN_ATTR_LINK)
                NLA_PUT_U32(msg, IFLA_VXLAN_LINK, vxi->vxi_link);
 
-       if (vxi->vxi_mask & VXLAN_HAS_LOCAL)
+       if (vxi->ce_mask & VXLAN_ATTR_LOCAL)
                NLA_PUT(msg, IFLA_VXLAN_LOCAL, sizeof(vxi->vxi_local), &vxi->vxi_local);
 
-       if (vxi->vxi_mask & VXLAN_HAS_LOCAL6)
+       if (vxi->ce_mask & VXLAN_ATTR_LOCAL6)
                NLA_PUT(msg, IFLA_VXLAN_LOCAL6, sizeof(vxi->vxi_local6), &vxi->vxi_local6);
 
-       if (vxi->vxi_mask & VXLAN_HAS_TTL)
+       if (vxi->ce_mask & VXLAN_ATTR_TTL)
                NLA_PUT_U8(msg, IFLA_VXLAN_TTL, vxi->vxi_ttl);
 
-       if (vxi->vxi_mask & VXLAN_HAS_TOS)
+       if (vxi->ce_mask & VXLAN_ATTR_TOS)
                NLA_PUT_U8(msg, IFLA_VXLAN_TOS, vxi->vxi_tos);
 
-       if (vxi->vxi_mask & VXLAN_HAS_LEARNING)
+       if (vxi->ce_mask & VXLAN_ATTR_LEARNING)
                NLA_PUT_U8(msg, IFLA_VXLAN_LEARNING, vxi->vxi_learning);
 
-       if (vxi->vxi_mask & VXLAN_HAS_AGEING)
+       if (vxi->ce_mask & VXLAN_ATTR_AGEING)
                NLA_PUT_U32(msg, IFLA_VXLAN_AGEING, vxi->vxi_ageing);
 
-       if (vxi->vxi_mask & VXLAN_HAS_LIMIT)
+       if (vxi->ce_mask & VXLAN_ATTR_LIMIT)
                NLA_PUT_U32(msg, IFLA_VXLAN_LIMIT, vxi->vxi_limit);
 
-       if (vxi->vxi_mask & VXLAN_HAS_PORT_RANGE)
+       if (vxi->ce_mask & VXLAN_ATTR_PORT_RANGE)
                NLA_PUT(msg, IFLA_VXLAN_PORT_RANGE, sizeof(vxi->vxi_port_range),
                                &vxi->vxi_port_range);
 
-       if (vxi->vxi_mask & VXLAN_HAS_PROXY)
+       if (vxi->ce_mask & VXLAN_ATTR_PROXY)
                NLA_PUT_U8(msg, IFLA_VXLAN_PROXY, vxi->vxi_proxy);
 
-       if (vxi->vxi_mask & VXLAN_HAS_RSC)
+       if (vxi->ce_mask & VXLAN_ATTR_RSC)
                NLA_PUT_U8(msg, IFLA_VXLAN_RSC, vxi->vxi_rsc);
 
-       if (vxi->vxi_mask & VXLAN_HAS_L2MISS)
+       if (vxi->ce_mask & VXLAN_ATTR_L2MISS)
                NLA_PUT_U8(msg, IFLA_VXLAN_L2MISS, vxi->vxi_l2miss);
 
-       if (vxi->vxi_mask & VXLAN_HAS_L3MISS)
+       if (vxi->ce_mask & VXLAN_ATTR_L3MISS)
                NLA_PUT_U8(msg, IFLA_VXLAN_L3MISS, vxi->vxi_l3miss);
 
        nla_nest_end(msg, data);
@@ -520,7 +520,7 @@ int rtnl_link_vxlan_set_id(struct rtnl_link *link, uint32_t id)
                return -NLE_INVAL;
 
        vxi->vxi_id = id;
-       vxi->vxi_mask |= VXLAN_HAS_ID;
+       vxi->ce_mask |= VXLAN_ATTR_ID;
 
        return 0;
 }
@@ -541,7 +541,7 @@ int rtnl_link_vxlan_get_id(struct rtnl_link *link, uint32_t *id)
        if(!id)
                return -NLE_INVAL;
 
-       if (vxi->vxi_mask & VXLAN_HAS_ID)
+       if (vxi->ce_mask & VXLAN_ATTR_ID)
                *id = vxi->vxi_id;
        else
                return -NLE_AGAIN;
@@ -566,14 +566,14 @@ int rtnl_link_vxlan_set_group(struct rtnl_link *link, struct nl_addr *addr)
            (nl_addr_get_len(addr) == sizeof(vxi->vxi_group))) {
                memcpy(&vxi->vxi_group, nl_addr_get_binary_addr(addr),
                       sizeof(vxi->vxi_group));
-               vxi->vxi_mask |= VXLAN_HAS_GROUP;
-               vxi->vxi_mask &= ~VXLAN_HAS_GROUP6;
+               vxi->ce_mask |= VXLAN_ATTR_GROUP;
+               vxi->ce_mask &= ~VXLAN_ATTR_GROUP6;
        } else if ((nl_addr_get_family(addr) == AF_INET6) &&
                   (nl_addr_get_len(addr) == sizeof(vxi->vxi_group6))) {
                memcpy(&vxi->vxi_group6, nl_addr_get_binary_addr(addr),
                       sizeof(vxi->vxi_group6));
-               vxi->vxi_mask |= VXLAN_HAS_GROUP6;
-               vxi->vxi_mask &= ~VXLAN_HAS_GROUP;
+               vxi->ce_mask |= VXLAN_ATTR_GROUP6;
+               vxi->ce_mask &= ~VXLAN_ATTR_GROUP;
        } else
                return -NLE_INVAL;
 
@@ -596,9 +596,9 @@ int rtnl_link_vxlan_get_group(struct rtnl_link *link, struct nl_addr **addr)
        if (!addr)
                return -NLE_INVAL;
 
-       if (vxi->vxi_mask & VXLAN_HAS_GROUP)
+       if (vxi->ce_mask & VXLAN_ATTR_GROUP)
                *addr = nl_addr_build(AF_INET, &vxi->vxi_group, sizeof(vxi->vxi_group));
-       else if (vxi->vxi_mask & VXLAN_HAS_GROUP6)
+       else if (vxi->ce_mask & VXLAN_ATTR_GROUP6)
                *addr = nl_addr_build(AF_INET6, &vxi->vxi_group6, sizeof(vxi->vxi_group6));
        else
                return -NLE_AGAIN;
@@ -620,7 +620,7 @@ int rtnl_link_vxlan_set_link(struct rtnl_link *link, uint32_t index)
        IS_VXLAN_LINK_ASSERT(link);
 
        vxi->vxi_link = index;
-       vxi->vxi_mask |= VXLAN_HAS_LINK;
+       vxi->ce_mask |= VXLAN_ATTR_LINK;
 
        return 0;
 }
@@ -641,7 +641,7 @@ int rtnl_link_vxlan_get_link(struct rtnl_link *link, uint32_t *index)
        if (!index)
                return -NLE_INVAL;
 
-       if (!(vxi->vxi_mask & VXLAN_HAS_LINK))
+       if (!(vxi->ce_mask & VXLAN_ATTR_LINK))
                return -NLE_AGAIN;
 
        *index = vxi->vxi_link;
@@ -666,14 +666,14 @@ int rtnl_link_vxlan_set_local(struct rtnl_link *link, struct nl_addr *addr)
            (nl_addr_get_len(addr) == sizeof(vxi->vxi_local))) {
                memcpy(&vxi->vxi_local, nl_addr_get_binary_addr(addr),
                       sizeof(vxi->vxi_local));
-               vxi->vxi_mask |= VXLAN_HAS_LOCAL;
-               vxi->vxi_mask &= VXLAN_HAS_LOCAL6;
+               vxi->ce_mask |= VXLAN_ATTR_LOCAL;
+               vxi->ce_mask &= VXLAN_ATTR_LOCAL6;
        } else if ((nl_addr_get_family(addr) == AF_INET6) &&
                   (nl_addr_get_len(addr) == sizeof(vxi->vxi_local6))) {
                memcpy(&vxi->vxi_local6, nl_addr_get_binary_addr(addr),
                       sizeof(vxi->vxi_local6));
-               vxi->vxi_mask |= VXLAN_HAS_LOCAL6;
-               vxi->vxi_mask &= ~VXLAN_HAS_LOCAL;
+               vxi->ce_mask |= VXLAN_ATTR_LOCAL6;
+               vxi->ce_mask &= ~VXLAN_ATTR_LOCAL;
        } else
                return -NLE_INVAL;
 
@@ -696,9 +696,9 @@ int rtnl_link_vxlan_get_local(struct rtnl_link *link, struct nl_addr **addr)
        if (!addr)
                return -NLE_INVAL;
 
-       if (vxi->vxi_mask & VXLAN_HAS_LOCAL)
+       if (vxi->ce_mask & VXLAN_ATTR_LOCAL)
                *addr = nl_addr_build(AF_INET, &vxi->vxi_local, sizeof(vxi->vxi_local));
-       else if (vxi->vxi_mask & VXLAN_HAS_LOCAL6)
+       else if (vxi->ce_mask & VXLAN_ATTR_LOCAL6)
                *addr = nl_addr_build(AF_INET6, &vxi->vxi_local6, sizeof(vxi->vxi_local6));
        else
                return -NLE_AGAIN;
@@ -720,7 +720,7 @@ int rtnl_link_vxlan_set_ttl(struct rtnl_link *link, uint8_t ttl)
        IS_VXLAN_LINK_ASSERT(link);
 
        vxi->vxi_ttl = ttl;
-       vxi->vxi_mask |= VXLAN_HAS_TTL;
+       vxi->ce_mask |= VXLAN_ATTR_TTL;
 
        return 0;
 }
@@ -737,7 +737,7 @@ int rtnl_link_vxlan_get_ttl(struct rtnl_link *link)
 
        IS_VXLAN_LINK_ASSERT(link);
 
-       if (!(vxi->vxi_mask & VXLAN_HAS_TTL))
+       if (!(vxi->ce_mask & VXLAN_ATTR_TTL))
                return -NLE_AGAIN;
 
        return vxi->vxi_ttl;
@@ -757,7 +757,7 @@ int rtnl_link_vxlan_set_tos(struct rtnl_link *link, uint8_t tos)
        IS_VXLAN_LINK_ASSERT(link);
 
        vxi->vxi_tos = tos;
-       vxi->vxi_mask |= VXLAN_HAS_TOS;
+       vxi->ce_mask |= VXLAN_ATTR_TOS;
 
        return 0;
 }
@@ -774,7 +774,7 @@ int rtnl_link_vxlan_get_tos(struct rtnl_link *link)
 
        IS_VXLAN_LINK_ASSERT(link);
 
-       if (!(vxi->vxi_mask & VXLAN_HAS_TOS))
+       if (!(vxi->ce_mask & VXLAN_ATTR_TOS))
                return -NLE_AGAIN;
 
        return vxi->vxi_tos;
@@ -794,7 +794,7 @@ int rtnl_link_vxlan_set_learning(struct rtnl_link *link, uint8_t learning)
        IS_VXLAN_LINK_ASSERT(link);
 
        vxi->vxi_learning = learning;
-       vxi->vxi_mask |= VXLAN_HAS_LEARNING;
+       vxi->ce_mask |= VXLAN_ATTR_LEARNING;
 
        return 0;
 }
@@ -811,7 +811,7 @@ int rtnl_link_vxlan_get_learning(struct rtnl_link *link)
 
        IS_VXLAN_LINK_ASSERT(link);
 
-       if (!(vxi->vxi_mask & VXLAN_HAS_LEARNING))
+       if (!(vxi->ce_mask & VXLAN_ATTR_LEARNING))
                return -NLE_AGAIN;
 
        return vxi->vxi_learning;
@@ -853,7 +853,7 @@ int rtnl_link_vxlan_set_ageing(struct rtnl_link *link, uint32_t expiry)
        IS_VXLAN_LINK_ASSERT(link);
 
        vxi->vxi_ageing = expiry;
-       vxi->vxi_mask |= VXLAN_HAS_AGEING;
+       vxi->ce_mask |= VXLAN_ATTR_AGEING;
 
        return 0;
 }
@@ -874,7 +874,7 @@ int rtnl_link_vxlan_get_ageing(struct rtnl_link *link, uint32_t *expiry)
        if (!expiry)
                return -NLE_INVAL;
 
-       if (vxi->vxi_mask & VXLAN_HAS_AGEING)
+       if (vxi->ce_mask & VXLAN_ATTR_AGEING)
                *expiry = vxi->vxi_ageing;
        else
                return -NLE_AGAIN;
@@ -896,7 +896,7 @@ int rtnl_link_vxlan_set_limit(struct rtnl_link *link, uint32_t limit)
        IS_VXLAN_LINK_ASSERT(link);
 
        vxi->vxi_limit = limit;
-       vxi->vxi_mask |= VXLAN_HAS_LIMIT;
+       vxi->ce_mask |= VXLAN_ATTR_LIMIT;
 
        return 0;
 }
@@ -917,7 +917,7 @@ int rtnl_link_vxlan_get_limit(struct rtnl_link *link, uint32_t *limit)
        if (!limit)
                return -NLE_INVAL;
 
-       if (vxi->vxi_mask & VXLAN_HAS_LIMIT)
+       if (vxi->ce_mask & VXLAN_ATTR_LIMIT)
                *limit = vxi->vxi_limit;
        else
                return -NLE_AGAIN;
@@ -943,7 +943,7 @@ int rtnl_link_vxlan_set_port_range(struct rtnl_link *link,
                return -NLE_INVAL;
 
        memcpy(&vxi->vxi_port_range, range, sizeof(vxi->vxi_port_range));
-       vxi->vxi_mask |= VXLAN_HAS_PORT_RANGE;
+       vxi->ce_mask |= VXLAN_ATTR_PORT_RANGE;
 
        return 0;
 }
@@ -965,7 +965,7 @@ int rtnl_link_vxlan_get_port_range(struct rtnl_link *link,
        if (!range)
                return -NLE_INVAL;
 
-       if (vxi->vxi_mask & VXLAN_HAS_PORT_RANGE)
+       if (vxi->ce_mask & VXLAN_ATTR_PORT_RANGE)
                memcpy(range, &vxi->vxi_port_range, sizeof(*range));
        else
                return -NLE_AGAIN;
@@ -987,7 +987,7 @@ int rtnl_link_vxlan_set_proxy(struct rtnl_link *link, uint8_t proxy)
        IS_VXLAN_LINK_ASSERT(link);
 
        vxi->vxi_proxy = proxy;
-       vxi->vxi_mask |= VXLAN_HAS_PROXY;
+       vxi->ce_mask |= VXLAN_ATTR_PROXY;
 
        return 0;
 }
@@ -1004,7 +1004,7 @@ int rtnl_link_vxlan_get_proxy(struct rtnl_link *link)
 
        IS_VXLAN_LINK_ASSERT(link);
 
-       if (!(vxi->vxi_mask & VXLAN_HAS_PROXY))
+       if (!(vxi->ce_mask & VXLAN_ATTR_PROXY))
                return -NLE_AGAIN;
 
        return vxi->vxi_proxy;
@@ -1046,7 +1046,7 @@ int rtnl_link_vxlan_set_rsc(struct rtnl_link *link, uint8_t rsc)
        IS_VXLAN_LINK_ASSERT(link);
 
        vxi->vxi_rsc = rsc;
-       vxi->vxi_mask |= VXLAN_HAS_RSC;
+       vxi->ce_mask |= VXLAN_ATTR_RSC;
 
        return 0;
 }
@@ -1063,7 +1063,7 @@ int rtnl_link_vxlan_get_rsc(struct rtnl_link *link)
 
        IS_VXLAN_LINK_ASSERT(link);
 
-       if (!(vxi->vxi_mask & VXLAN_HAS_RSC))
+       if (!(vxi->ce_mask & VXLAN_ATTR_RSC))
                return -NLE_AGAIN;
 
        return vxi->vxi_rsc;
@@ -1105,7 +1105,7 @@ int rtnl_link_vxlan_set_l2miss(struct rtnl_link *link, uint8_t miss)
        IS_VXLAN_LINK_ASSERT(link);
 
        vxi->vxi_l2miss = miss;
-       vxi->vxi_mask |= VXLAN_HAS_L2MISS;
+       vxi->ce_mask |= VXLAN_ATTR_L2MISS;
 
        return 0;
 }
@@ -1122,7 +1122,7 @@ int rtnl_link_vxlan_get_l2miss(struct rtnl_link *link)
 
        IS_VXLAN_LINK_ASSERT(link);
 
-       if (!(vxi->vxi_mask & VXLAN_HAS_L2MISS))
+       if (!(vxi->ce_mask & VXLAN_ATTR_L2MISS))
                return -NLE_AGAIN;
 
        return vxi->vxi_l2miss;
@@ -1164,7 +1164,7 @@ int rtnl_link_vxlan_set_l3miss(struct rtnl_link *link, uint8_t miss)
        IS_VXLAN_LINK_ASSERT(link);
 
        vxi->vxi_l3miss = miss;
-       vxi->vxi_mask |= VXLAN_HAS_L3MISS;
+       vxi->ce_mask |= VXLAN_ATTR_L3MISS;
 
        return 0;
 }
@@ -1181,7 +1181,7 @@ int rtnl_link_vxlan_get_l3miss(struct rtnl_link *link)
 
        IS_VXLAN_LINK_ASSERT(link);
 
-       if (!(vxi->vxi_mask & VXLAN_HAS_L3MISS))
+       if (!(vxi->ce_mask & VXLAN_ATTR_L3MISS))
                return -NLE_AGAIN;
 
        return vxi->vxi_l3miss;