aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/addr.h
diff options
context:
space:
mode:
Diffstat (limited to 'net/tipc/addr.h')
-rw-r--r--net/tipc/addr.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/tipc/addr.h b/net/tipc/addr.h
index 3ba67e6ce03e..4d4aee0e4232 100644
--- a/net/tipc/addr.h
+++ b/net/tipc/addr.h
@@ -67,7 +67,7 @@ static inline int may_route(u32 addr)
67 return(addr ^ tipc_own_addr) >> 11; 67 return(addr ^ tipc_own_addr) >> 11;
68} 68}
69 69
70static inline int in_scope(u32 domain, u32 addr) 70static inline int tipc_in_scope(u32 domain, u32 addr)
71{ 71{
72 if (!domain || (domain == addr)) 72 if (!domain || (domain == addr))
73 return 1; 73 return 1;
@@ -79,10 +79,10 @@ static inline int in_scope(u32 domain, u32 addr)
79} 79}
80 80
81/** 81/**
82 * addr_scope - convert message lookup domain to equivalent 2-bit scope value 82 * tipc_addr_scope - convert message lookup domain to a 2-bit scope value
83 */ 83 */
84 84
85static inline int addr_scope(u32 domain) 85static inline int tipc_addr_scope(u32 domain)
86{ 86{
87 if (likely(!domain)) 87 if (likely(!domain))
88 return TIPC_ZONE_SCOPE; 88 return TIPC_ZONE_SCOPE;
@@ -110,7 +110,7 @@ static inline int addr_domain(int sc)
110 return tipc_addr(tipc_zone(tipc_own_addr), 0, 0); 110 return tipc_addr(tipc_zone(tipc_own_addr), 0, 0);
111} 111}
112 112
113static inline char *addr_string_fill(char *string, u32 addr) 113static inline char *tipc_addr_string_fill(char *string, u32 addr)
114{ 114{
115 snprintf(string, 16, "<%u.%u.%u>", 115 snprintf(string, 16, "<%u.%u.%u>",
116 tipc_zone(addr), tipc_cluster(addr), tipc_node(addr)); 116 tipc_zone(addr), tipc_cluster(addr), tipc_node(addr));