summaryrefslogtreecommitdiff
path: root/net/tipc/bearer.c
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2010-05-11 14:30:12 +0000
committerDavid S. Miller <davem@davemloft.net>2010-05-12 23:02:25 -0700
commitc68ca7b72017f8f52e7aed0d2a6ecfaede133b6b (patch)
tree37e428def9c1720122282efa23d18834f8060795 /net/tipc/bearer.c
parent01fee256a675f6492fc6945bbb9b59640d8705d4 (diff)
downloadlinux-3.10-c68ca7b72017f8f52e7aed0d2a6ecfaede133b6b.tar.gz
linux-3.10-c68ca7b72017f8f52e7aed0d2a6ecfaede133b6b.tar.bz2
linux-3.10-c68ca7b72017f8f52e7aed0d2a6ecfaede133b6b.zip
tipc: add tipc_ prefix to fcns targeted for un-inlining
These functions have enough code in them such that they seem like sensible targets for un-inlining. Prior to doing that, this adds the tipc_ prefix to the functions, so that in the event of a panic dump or similar, the subsystem from which the functions come from is immediately clear. Signed-off-by: Allan Stephens <allan.stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.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 78091375ca1..ccec12f0ccc 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -493,7 +493,7 @@ int tipc_enable_bearer(const char *name, u32 bcast_scope, u32 priority)
return -EINVAL;
}
if (!tipc_addr_domain_valid(bcast_scope) ||
- !in_scope(bcast_scope, tipc_own_addr)) {
+ !tipc_in_scope(bcast_scope, tipc_own_addr)) {
warn("Bearer <%s> rejected, illegal broadcast scope\n", name);
return -EINVAL;
}
@@ -571,7 +571,7 @@ restart:
spin_lock_init(&b_ptr->publ.lock);
write_unlock_bh(&tipc_net_lock);
info("Enabled bearer <%s>, discovery domain %s, priority %u\n",
- name, addr_string_fill(addr_string, bcast_scope), priority);
+ name, tipc_addr_string_fill(addr_string, bcast_scope), priority);
return 0;
failed:
write_unlock_bh(&tipc_net_lock);