diff options
| author |  Eric Dumazet <edumazet@google.com>
| 2022-06-08 23:34:07 -0700 |
|---|---|---|
| committer |  Jakub Kicinski <kuba@kernel.org>
| 2022-06-10 16:21:26 -0700 |
| commit | 100fdd1faf50557558e2911af4be32e515cb8036 (patch) | |
| tree | fee14b800e416c074bec907d89586bf64c7559ef /net/ipv4/tcp.c | |
| parent | Revert "net: set SK_MEM_QUANTUM to 4096" (diff) | |
| download | linux-100fdd1faf50557558e2911af4be32e515cb8036.tar.gz linux-100fdd1faf50557558e2911af4be32e515cb8036.tar.bz2 linux-100fdd1faf50557558e2911af4be32e515cb8036.zip | |
net: remove SK_MEM_QUANTUM and SK_MEM_QUANTUM_SHIFT
Due to memcg interface, SK_MEM_QUANTUM is effectively PAGE_SIZE.
This might change in the future, but it seems better to avoid the
confusion.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Shakeel Butt <shakeelb@google.com>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 9984d23a7f3e..9e696758a4c2 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -4661,11 +4661,11 @@ void __init tcp_init(void) max_wshare = min(4UL*1024*1024, limit); max_rshare = min(6UL*1024*1024, limit); - init_net.ipv4.sysctl_tcp_wmem[0] = SK_MEM_QUANTUM; + init_net.ipv4.sysctl_tcp_wmem[0] = PAGE_SIZE; init_net.ipv4.sysctl_tcp_wmem[1] = 16*1024; init_net.ipv4.sysctl_tcp_wmem[2] = max(64*1024, max_wshare); - init_net.ipv4.sysctl_tcp_rmem[0] = SK_MEM_QUANTUM; + init_net.ipv4.sysctl_tcp_rmem[0] = PAGE_SIZE; init_net.ipv4.sysctl_tcp_rmem[1] = 131072; init_net.ipv4.sysctl_tcp_rmem[2] = max(131072, max_rshare); |