diff options
| author |   Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com> | 2016-07-26 08:47:18 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-07-26 14:26:42 -0700 |
| commit | 9ff26e9fabaf52f28fb5e875c0b9ffc2d1512039 (patch) | |
| tree | d5eb3bafaf3a8d6a4e57a3547fb1a80e3795d448 /net/tipc/bearer.c | |
| parent | net: neigh: disallow transition to NUD_STALE if lladdr is unchanged in neigh_update() (diff) | |
| download | linux-dev-9ff26e9fabaf52f28fb5e875c0b9ffc2d1512039.tar.xz linux-dev-9ff26e9fabaf52f28fb5e875c0b9ffc2d1512039.zip | |
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.c | 4 |
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, 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; |