1 files changed, 23 insertions, 50 deletions

diff --git a/net/tipc/addr.h b/net/tipc/addr.h
index 3ba67e6ce03..a74acf9ee80 100644
--- a/net/tipc/addr.h
+++ b/net/tipc/addr.h
@@ -37,60 +37,40 @@
 #ifndef _TIPC_ADDR_H
 #define _TIPC_ADDR_H
 
-static inline u32 own_node(void)
-{
-	return tipc_node(tipc_own_addr);
-}
-
-static inline u32 own_cluster(void)
-{
-	return tipc_cluster(tipc_own_addr);
-}
+#include "core.h"
 
-static inline u32 own_zone(void)
-{
-	return tipc_zone(tipc_own_addr);
-}
+#define TIPC_ZONE_MASK		0xff000000u
+#define TIPC_CLUSTER_MASK	0xfffff000u
 
-static inline int in_own_cluster(u32 addr)
+static inline u32 tipc_zone_mask(u32 addr)
 {
-	return !((addr ^ tipc_own_addr) >> 12);
+	return addr & TIPC_ZONE_MASK;
 }
 
-static inline int is_slave(u32 addr)
+static inline u32 tipc_cluster_mask(u32 addr)
 {
-	return addr & 0x800;
+	return addr & TIPC_CLUSTER_MASK;
 }
 
-static inline int may_route(u32 addr)
+static inline int in_own_cluster_exact(u32 addr)
 {
-	return(addr ^ tipc_own_addr) >> 11;
+	return !((addr ^ tipc_own_addr) >> 12);
 }
 
-static inline int in_scope(u32 domain, u32 addr)
+/**
+ * in_own_node - test for node inclusion; <0.0.0> always matches
+ */
+static inline int in_own_node(u32 addr)
 {
-	if (!domain || (domain == addr))
-		return 1;
-	if (domain == (addr & 0xfffff000u)) /* domain <Z.C.0> */
-		return 1;
-	if (domain == (addr & 0xff000000u)) /* domain <Z.0.0> */
-		return 1;
-	return 0;
+	return (addr == tipc_own_addr) || !addr;
 }
 
 /**
- * addr_scope - convert message lookup domain to equivalent 2-bit scope value
+ * in_own_cluster - test for cluster inclusion; <0.0.0> always matches
  */
-
-static inline int addr_scope(u32 domain)
+static inline int in_own_cluster(u32 addr)
 {
-	if (likely(!domain))
-		return TIPC_ZONE_SCOPE;
-	if (tipc_node(domain))
-		return TIPC_NODE_SCOPE;
-	if (tipc_cluster(domain))
-		return TIPC_CLUSTER_SCOPE;
-	return TIPC_ZONE_SCOPE;
+	return in_own_cluster_exact(addr) || !addr;
 }
 
 /**
@@ -99,25 +79,18 @@ static inline int addr_scope(u32 domain)
  * Needed when address of a named message must be looked up a second time
  * after a network hop.
  */
-
-static inline int addr_domain(int sc)
+static inline u32 addr_domain(u32 sc)
 {
 	if (likely(sc == TIPC_NODE_SCOPE))
 		return tipc_own_addr;
 	if (sc == TIPC_CLUSTER_SCOPE)
-		return tipc_addr(tipc_zone(tipc_own_addr),
-				 tipc_cluster(tipc_own_addr), 0);
-	return tipc_addr(tipc_zone(tipc_own_addr), 0, 0);
-}
-
-static inline char *addr_string_fill(char *string, u32 addr)
-{
-	snprintf(string, 16, "<%u.%u.%u>",
-		 tipc_zone(addr), tipc_cluster(addr), tipc_node(addr));
-	return string;
+		return tipc_cluster_mask(tipc_own_addr);
+	return tipc_zone_mask(tipc_own_addr);
 }
 
 int tipc_addr_domain_valid(u32);
 int tipc_addr_node_valid(u32 addr);
-
+int tipc_in_scope(u32 domain, u32 addr);
+int tipc_addr_scope(u32 domain);
+char *tipc_addr_string_fill(char *string, u32 addr);
 #endif