Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[safe/jmp/linux-2.6] / net / core / sysctl_net_core.c

diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index 887c03c..8938fa7 100644 (file)
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -136,7 +136,7 @@ static __net_init int sysctl_core_net_init(struct net *net)
        net->core.sysctl_somaxconn = SOMAXCONN;
 
        tbl = netns_core_table;
-       if (net != &init_net) {
+       if (!net_eq(net, &init_net)) {
                tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
                if (tbl == NULL)
                        goto err_dup;