aboutsummaryrefslogtreecommitdiff
path: root/net/ipv4/af_inet.c
diff options
context:
space:
mode:
authorGravatar Eric W. Biederman <ebiederm@xmission.com> 2013-10-19 16:25:36 -0700
committerGravatar David S. Miller <davem@davemloft.net> 2013-10-21 18:43:02 -0400
commita4fe34bf902b8f709c635ab37f1f39de0b86cff2 (patch)
tree955c388e64c320eda8759bd970a5284473c8e1d5 /net/ipv4/af_inet.c
parenttcp_memcontrol: Remove setting cgroup settings via sysctl (diff)
downloadlinux-a4fe34bf902b8f709c635ab37f1f39de0b86cff2.tar.gz
linux-a4fe34bf902b8f709c635ab37f1f39de0b86cff2.tar.bz2
linux-a4fe34bf902b8f709c635ab37f1f39de0b86cff2.zip
tcp_memcontrol: Remove the per netns control.
The code that is implemented is per memory cgroup not per netns, and having per netns bits is just confusing. Remove the per netns bits to make it easier to see what is really going on. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/af_inet.c')
-rw-r--r--net/ipv4/af_inet.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 9433a6186f54..24a53fc275b0 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1697,8 +1697,6 @@ static int __init inet_init(void)
ip_static_sysctl_init();
#endif
- tcp_prot.sysctl_mem = init_net.ipv4.sysctl_tcp_mem;
-
/*
* Add all the base protocols.
*/