diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-02-07 01:10:52 +0400 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-02-07 01:11:02 +0400 |
| commit | 5ddf146f70a44ed4133dea4d377b172605a1cfa5 (patch) | |
| tree | 058b6f58b5ab756f9fe798983e7c7bbf75450509 /net/ipv4/sysctl_net_ipv4.c | |
| parent | 781ba9d2ed9df07dbb413fb5ee80ef7d353841c9 (diff) | |
| parent | a4a03fc7ef89020baca4f19174e6a43767c6d78a (diff) | |
| download | linux-5ddf146f70a44ed4133dea4d377b172605a1cfa5.tar.xz | |
Merge branch 'perf/urgent' into perf/core
So that we can get the perf bench exec stack fixes and then apply the
remaining fix for the files added after what is in perf/urgent.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'net/ipv4/sysctl_net_ipv4.c')
| -rw-r--r-- | net/ipv4/sysctl_net_ipv4.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index 4aa7e9dc0cbb..4cb9cd2f2c39 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c @@ -814,6 +814,7 @@ static __net_init int ipv4_sysctl_init_net(struct net *net) net->ipv4.sysctl_rt_cache_rebuild_count = 4; + tcp_init_mem(net); limit = nr_free_buffer_pages() / 8; limit = max(limit, 128UL); net->ipv4.sysctl_tcp_mem[0] = limit / 4 * 3; |