From 307d5b46f2c1232c56dae41915e7392e996587bd Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 6 Nov 2007 23:48:57 -0800 Subject: [PATCH] --- yaml --- r: 73269 b: refs/heads/master c: df61c952622f51facac21dd8dfa4d8a24dcb9657 h: refs/heads/master i: 73267: 24afaa379e94f529aa213c2545817c6d753d526b v: v3 --- [refs] | 2 +- trunk/fs/dlm/lowcomms.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3782e8b5ce57..156cb8033a8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3e9a353d8fc64a82ab11a07e21902e25e1e96d1 +refs/heads/master: df61c952622f51facac21dd8dfa4d8a24dcb9657 diff --git a/trunk/fs/dlm/lowcomms.c b/trunk/fs/dlm/lowcomms.c index 58bf3f5cdbe2..e9923ca9c2d9 100644 --- a/trunk/fs/dlm/lowcomms.c +++ b/trunk/fs/dlm/lowcomms.c @@ -1062,7 +1062,7 @@ static int sctp_listen_for_all(void) subscribe.sctp_shutdown_event = 1; subscribe.sctp_partial_delivery_event = 1; - result = kernel_setsockopt(sock, SOL_SOCKET, SO_RCVBUF, + result = kernel_setsockopt(sock, SOL_SOCKET, SO_RCVBUFFORCE, (char *)&bufsize, sizeof(bufsize)); if (result) log_print("Error increasing buffer space on socket %d", result); @@ -1454,10 +1454,6 @@ int dlm_lowcomms_start(void) if (!con_cache) goto out; - /* Set some sysctl minima */ - if (sysctl_rmem_max < NEEDED_RMEM) - sysctl_rmem_max = NEEDED_RMEM; - /* Start listening */ if (dlm_config.ci_protocol == 0) error = tcp_listen_for_all();