diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-20 20:40:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-20 20:40:31 -0400 |
| commit | 167de77fd4e5646f98f67bd9f0a0054a891f6ff4 (patch) | |
| tree | abe31d384dbe9c7bad0da839600423d1eda4b6e2 /net/tipc/bearer.c | |
| parent | 2528a5dc4331aebbb990f2a56d179dfa35de4a4f (diff) | |
| parent | 9d52ce4bd3fa9e0cf1658791f2c680e20e0598a1 (diff) | |
Merge branch 'tipc_net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
Diffstat (limited to 'net/tipc/bearer.c')
| -rw-r--r-- | net/tipc/bearer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c index 5dfd89c4042..0bfdeba91d5 100644 --- a/net/tipc/bearer.c +++ b/net/tipc/bearer.c @@ -449,7 +449,7 @@ int tipc_enable_bearer(const char *name, u32 disc_domain, u32 priority) if (tipc_in_scope(disc_domain, tipc_own_addr)) { disc_domain = tipc_own_addr & TIPC_CLUSTER_MASK; res = 0; /* accept any node in own cluster */ - } else if (in_own_cluster(disc_domain)) + } else if (in_own_cluster_exact(disc_domain)) res = 0; /* accept specified node in own cluster */ } if (res) { |