diff options
| author | David S. Miller <davem@davemloft.net> | 2016-05-03 15:51:17 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-03 15:51:17 -0400 |
| commit | e34b1638d02bef8c3278af30ee73077c5babc082 (patch) | |
| tree | f8ce3ae55f12a36bc4361d9ee515b3f301051c65 /net/tipc/core.c | |
| parent | 2b84af94a3932b1dcb716d1898edb18b7325dbea (diff) | |
| parent | 10724cc7bb7832b482df049c20fd824d928c5eaa (diff) | |
Merge branch 'tipc-next'
Jon Maloy says:
====================
tipc: redesign socket-level flow control
The socket-level flow control in TIPC has long been due for a major
overhaul. This series fixes this.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/core.c')
| -rw-r--r-- | net/tipc/core.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/tipc/core.c b/net/tipc/core.c index e2bdb07a49a2..fe1b062c4f18 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c @@ -112,11 +112,9 @@ static int __init tipc_init(void) pr_info("Activated (version " TIPC_MOD_VER ")\n"); - sysctl_tipc_rmem[0] = TIPC_CONN_OVERLOAD_LIMIT >> 4 << - TIPC_LOW_IMPORTANCE; - sysctl_tipc_rmem[1] = TIPC_CONN_OVERLOAD_LIMIT >> 4 << - TIPC_CRITICAL_IMPORTANCE; - sysctl_tipc_rmem[2] = TIPC_CONN_OVERLOAD_LIMIT; + sysctl_tipc_rmem[0] = RCVBUF_MIN; + sysctl_tipc_rmem[1] = RCVBUF_DEF; + sysctl_tipc_rmem[2] = RCVBUF_MAX; err = tipc_netlink_start(); if (err) |