Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / net / tipc / addr.c

diff --git a/net/tipc/addr.c b/net/tipc/addr.c
index 8a2e89bffde5ca6677b3562a65b61380a3f7e0a7..88463d9a6f12c99562378a5c8c93b39329b19cf3 100644 (file)
--- a/net/tipc/addr.c
+++ b/net/tipc/addr.c
@@ -35,11 +35,7 @@
  */
 
 #include "core.h"
-#include "dbg.h"
 #include "addr.h"
-#include "zone.h"
-#include "cluster.h"
-#include "net.h"
 
 /**
  * tipc_addr_domain_valid - validates a network domain address
@@ -57,14 +53,8 @@ int tipc_addr_domain_valid(u32 addr)
        u32 z = tipc_zone(addr);
        u32 max_nodes = tipc_max_nodes;
 
-       if (is_slave(addr))
-               max_nodes = LOWEST_SLAVE + tipc_max_slaves;
        if (n > max_nodes)
                return 0;
-       if (c > tipc_max_clusters)
-               return 0;
-       if (z > tipc_max_zones)
-               return 0;
 
        if (n && (!z || !c))
                return 0;