Commit df61c952 authored by David S. Miller's avatar David S. Miller

[DLM] lowcomms: Do not muck with sysctl_rmem_max.

Use SO_RCVBUFFORCE instead.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c3e9a353
...@@ -1062,7 +1062,7 @@ static int sctp_listen_for_all(void) ...@@ -1062,7 +1062,7 @@ static int sctp_listen_for_all(void)
subscribe.sctp_shutdown_event = 1; subscribe.sctp_shutdown_event = 1;
subscribe.sctp_partial_delivery_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)); (char *)&bufsize, sizeof(bufsize));
if (result) if (result)
log_print("Error increasing buffer space on socket %d", result); log_print("Error increasing buffer space on socket %d", result);
...@@ -1454,10 +1454,6 @@ int dlm_lowcomms_start(void) ...@@ -1454,10 +1454,6 @@ int dlm_lowcomms_start(void)
if (!con_cache) if (!con_cache)
goto out; goto out;
/* Set some sysctl minima */
if (sysctl_rmem_max < NEEDED_RMEM)
sysctl_rmem_max = NEEDED_RMEM;
/* Start listening */ /* Start listening */
if (dlm_config.ci_protocol == 0) if (dlm_config.ci_protocol == 0)
error = tcp_listen_for_all(); error = tcp_listen_for_all();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment