aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorGlauber Costa <glommer@parallels.com>2011-12-11 16:47:05 -0500
committerDavid S. Miller <davem@davemloft.net>2011-12-12 19:04:11 -0500
commit3dc43e3e4d0b52197d3205214fe8f162f9e0c334 (patch)
tree1770affeb483a6b4f06cde9f2a2f1289b41496d6 /include/net
parentd1a4c0b37c296e600ffe08edb0db2dc1b8f550d7 (diff)
per-netns ipv4 sysctl_tcp_mem
This patch allows each namespace to independently set up its levels for tcp memory pressure thresholds. This patch alone does not buy much: we need to make this values per group of process somehow. This is achieved in the patches that follows in this patchset. Signed-off-by: Glauber Costa <glommer@parallels.com> Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> CC: David S. Miller <davem@davemloft.net> CC: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/netns/ipv4.h1
-rw-r--r--include/net/tcp.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index d786b4fc02a..bbd023a1c9b 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -55,6 +55,7 @@ struct netns_ipv4 {
55 int current_rt_cache_rebuild_count; 55 int current_rt_cache_rebuild_count;
56 56
57 unsigned int sysctl_ping_group_range[2]; 57 unsigned int sysctl_ping_group_range[2];
58 long sysctl_tcp_mem[3];
58 59
59 atomic_t rt_genid; 60 atomic_t rt_genid;
60 atomic_t dev_addr_genid; 61 atomic_t dev_addr_genid;
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 913473b4eda..a4f52e15484 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -230,7 +230,6 @@ extern int sysctl_tcp_fack;
230extern int sysctl_tcp_reordering; 230extern int sysctl_tcp_reordering;
231extern int sysctl_tcp_ecn; 231extern int sysctl_tcp_ecn;
232extern int sysctl_tcp_dsack; 232extern int sysctl_tcp_dsack;
233extern long sysctl_tcp_mem[3];
234extern int sysctl_tcp_wmem[3]; 233extern int sysctl_tcp_wmem[3];
235extern int sysctl_tcp_rmem[3]; 234extern int sysctl_tcp_rmem[3];
236extern int sysctl_tcp_app_win; 235extern int sysctl_tcp_app_win;