Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

[linux-2.6] / net / tipc / net.c

diff --git a/net/tipc/net.c b/net/tipc/net.c
index cc51fa483672a12234c5f653f1392536d4b89000..ec7b04fbdc435b7421f5487ff57a2d0df7308801 100644 (file)
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
@@ -165,7 +165,7 @@ static int net_init(void)
        if (!tipc_net.zones) {
                return -ENOMEM;
        }
-       return TIPC_OK;
+       return 0;
 }
 
 static void net_stop(void)
@@ -295,7 +295,7 @@ int tipc_net_start(u32 addr)
        info("Started in network mode\n");
        info("Own node address %s, network identity %u\n",
             addr_string_fill(addr_string, tipc_own_addr), tipc_net_id);
-       return TIPC_OK;
+       return 0;
 }
 
 void tipc_net_stop(void)