From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) by mail19.linbit.com (LINBIT Mail Daemon) with ESMTP id 5D81942062C for ; Sun, 13 Dec 2020 06:07:24 +0100 (CET) Received: by mail-qk1-f196.google.com with SMTP id w79so12704839qkb.5 for ; Sat, 12 Dec 2020 21:07:24 -0800 (PST) From: Michael D Labriola To: drbd-dev@lists.linbit.com Date: Sun, 13 Dec 2020 00:07:01 -0500 Message-Id: <20201213050704.997-6-michael.d.labriola@gmail.com> In-Reply-To: <20201213050704.997-1-michael.d.labriola@gmail.com> References: <20201213050704.997-1-michael.d.labriola@gmail.com> Subject: [Drbd-dev] [PATCH 5/8] drbd: use sock_set_keepalive() instead of kernel_setsockopt() List-Id: "*Coordination* of development, patches, contributions -- *Questions* \(even to developers\) go to drbd-user, please." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Looks like the rest of the code has been updated to use 5.8's sock_set_* and tcp_set_* functions, but we've missed this one case. Signed-off-by: Michael D Labriola --- drbd/drbd_transport_tcp.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drbd/drbd_transport_tcp.c b/drbd/drbd_transport_tcp.c index 203dc4e0..3b1d4273 100644 --- a/drbd/drbd_transport_tcp.c +++ b/drbd/drbd_transport_tcp.c @@ -883,7 +883,6 @@ static int dtt_connect(struct drbd_transport *transport) struct socket *dsocket, *csocket; struct net_conf *nc; int timeout, err; - int one = 1; bool ok; dsocket = NULL; @@ -1065,9 +1064,7 @@ randomize: dsocket->sk->sk_sndtimeo = timeout; csocket->sk->sk_sndtimeo = timeout; - err = kernel_setsockopt(dsocket, SOL_SOCKET, SO_KEEPALIVE, (char *)&one, sizeof(one)); - if (err) - tr_warn(transport, "Failed to enable SO_KEEPALIVE %d\n", err); + sock_set_keepalive(dsocket->sk); return 0; -- 2.17.1