tipc: introduce constants for tipc address validation

In this commit, we introduce defines for tipc address size,
offset and mask specification for Zone.Cluster.Node.
There is no functional change in this commit.

Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 3 insertions, 6 deletions

diff --git a/net/tipc/addr.h b/net/tipc/addr.h
index 64f4004a6fac..bebb347803ce 100644
--- a/net/tipc/addr.h
+++ b/net/tipc/addr.h
@@ -43,9 +43,6 @@
 #include <net/netns/generic.h>
 #include "core.h"
 
-#define TIPC_ZONE_MASK          0xff000000u
-#define TIPC_CLUSTER_MASK       0xfffff000u
-
 static inline u32 tipc_own_addr(struct net *net)
 {
         struct tipc_net *tn = net_generic(net, tipc_net_id);
@@ -60,7 +57,7 @@ static inline u32 tipc_zone_mask(u32 addr)
 
 static inline u32 tipc_cluster_mask(u32 addr)
 {
-        return addr & TIPC_CLUSTER_MASK;
+        return addr & TIPC_ZONE_CLUSTER_MASK;
 }
 
 u32 tipc_own_addr(struct net *net);
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index 4131d5a86f55..65b0998a9bab 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -225,7 +225,7 @@ static int tipc_enable_bearer(struct net *net, const char *name,
         if (tipc_addr_domain_valid(disc_domain) &&
             (disc_domain != tn->own_addr)) {
                 if (tipc_in_scope(disc_domain, tn->own_addr)) {
-                        disc_domain = tn->own_addr & TIPC_CLUSTER_MASK;
+                        disc_domain = tn->own_addr & TIPC_ZONE_CLUSTER_MASK;
                         res = 0;   /* accept any node in own cluster */
                 } else if (in_own_cluster_exact(net, disc_domain))
                         res = 0;   /* accept specified node in own cluster */
@@ -832,7 +832,7 @@ int tipc_nl_bearer_enable(struct sk_buff *skb, struct genl_info *info)
         u32 prio;
 
         prio = TIPC_MEDIA_LINK_PRI;
-        domain = tn->own_addr & TIPC_CLUSTER_MASK;
+        domain = tn->own_addr & TIPC_ZONE_CLUSTER_MASK;
 
         if (!info->attrs[TIPC_NLA_BEARER])
                 return -EINVAL;