projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
[linux-2.6-block.git]
/
net
/
core
/
sysctl_net_core.c
diff --git
a/net/core/sysctl_net_core.c
b/net/core/sysctl_net_core.c
index 267314664813f5f436d1b4bb3d0bccb49e4e4f0d..06124872af5ba017d71e6817c9e0f4c9d8ac21ea 100644
(file)
--- a/
net/core/sysctl_net_core.c
+++ b/
net/core/sysctl_net_core.c
@@
-123,7
+123,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;