Merge tag 'please-pull-misc-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-zesty-kernel.git] / net / tipc / core.c

diff --git a/net/tipc/core.c b/net/tipc/core.c
index e2bdb07a49a2d6d95e55a051b048082934db9daf..fe1b062c4f18a96754c22001934f45eedb9ae8cc 100644 (file)
--- 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)