summaryrefslogtreecommitdiffstats
path: root/net/tipc/bearer.c
diff options
context:
space:
mode:
authorParthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com>2016-07-26 02:47:18 -0400
committerDavid S. Miller <davem@davemloft.net>2016-07-26 17:26:42 -0400
commit9ff26e9fabaf52f28fb5e875c0b9ffc2d1512039 (patch)
treed5eb3bafaf3a8d6a4e57a3547fb1a80e3795d448 /net/tipc/bearer.c
parentd1c2b5010d07e967d7cbcc232a86b2308d824ca3 (diff)
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>
Diffstat (limited to 'net/tipc/bearer.c')
-rw-r--r--net/tipc/bearer.c4
1 files changed, 2 insertions, 2 deletions
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,
225 if (tipc_addr_domain_valid(disc_domain) && 225 if (tipc_addr_domain_valid(disc_domain) &&
226 (disc_domain != tn->own_addr)) { 226 (disc_domain != tn->own_addr)) {
227 if (tipc_in_scope(disc_domain, tn->own_addr)) { 227 if (tipc_in_scope(disc_domain, tn->own_addr)) {
228 disc_domain = tn->own_addr & TIPC_CLUSTER_MASK; 228 disc_domain = tn->own_addr & TIPC_ZONE_CLUSTER_MASK;
229 res = 0; /* accept any node in own cluster */ 229 res = 0; /* accept any node in own cluster */
230 } else if (in_own_cluster_exact(net, disc_domain)) 230 } else if (in_own_cluster_exact(net, disc_domain))
231 res = 0; /* accept specified node in own cluster */ 231 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)
832 u32 prio; 832 u32 prio;
833 833
834 prio = TIPC_MEDIA_LINK_PRI; 834 prio = TIPC_MEDIA_LINK_PRI;
835 domain = tn->own_addr & TIPC_CLUSTER_MASK; 835 domain = tn->own_addr & TIPC_ZONE_CLUSTER_MASK;
836 836
837 if (!info->attrs[TIPC_NLA_BEARER]) 837 if (!info->attrs[TIPC_NLA_BEARER])
838 return -EINVAL; 838 return -EINVAL;