Merge branch 'delayed-logging-for-2.6.35' into for-linus

[linux-drm-fsl-dcu.git] / net / tipc / addr.h

diff --git a/net/tipc/addr.h b/net/tipc/addr.h
index e4bd5335e48d9eb64bdd9d5b1bf899ce7a8ec8d9..c1cc5724d8cc85f546cdb21eb2de110fd4c660e4 100644 (file)
--- a/net/tipc/addr.h
+++ b/net/tipc/addr.h
@@ -57,11 +57,6 @@ static inline int in_own_cluster(u32 addr)
        return !((addr ^ tipc_own_addr) >> 12);
 }
 
-static inline int in_own_zone(u32 addr)
-{
-       return !((addr ^ tipc_own_addr) >> 24);
-}
-
 static inline int is_slave(u32 addr)
 {
        return addr & 0x800;
@@ -72,32 +67,6 @@ static inline int may_route(u32 addr)
        return(addr ^ tipc_own_addr) >> 11;
 }
 
-static inline int in_scope(u32 domain, 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;
-}
-
-/**
- * addr_scope - convert message lookup domain to equivalent 2-bit scope value
- */
-
-static inline int addr_scope(u32 domain)
-{
-       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;
-}
-
 /**
  * addr_domain - convert 2-bit scope value to equivalent message lookup domain
  *
@@ -115,14 +84,9 @@ static inline int addr_domain(int sc)
        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;
-}
-
 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