Merge branch 'for-3.5/drivers' of git://git.kernel.dk/linux-block

[firefly-linux-kernel-4.4.55.git] / drivers / block / drbd / drbd_receiver.c

diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 1d088c4781508089f1561c39ae0f3b3e2dc0de92..ea4836e0ae9829e12206e482cc50b70678a3e4aa 100644 (file)
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -665,7 +665,7 @@ static struct socket *drbd_wait_for_connect(struct drbd_conf *mdev)
        timeo = mdev->net_conf->try_connect_int * HZ;
        timeo += (random32() & 1) ? timeo / 7 : -timeo / 7; /* 28.5% random jitter */
 
-       s_listen->sk->sk_reuse    = 1; /* SO_REUSEADDR */
+       s_listen->sk->sk_reuse    = SK_CAN_REUSE; /* SO_REUSEADDR */
        s_listen->sk->sk_rcvtimeo = timeo;
        s_listen->sk->sk_sndtimeo = timeo;
        drbd_setbufsize(s_listen, mdev->net_conf->sndbuf_size,
@@ -843,8 +843,8 @@ retry:
                }
        } while (1);
 
-       msock->sk->sk_reuse = 1; /* SO_REUSEADDR */
-       sock->sk->sk_reuse = 1; /* SO_REUSEADDR */
+       msock->sk->sk_reuse = SK_CAN_REUSE; /* SO_REUSEADDR */
+       sock->sk->sk_reuse = SK_CAN_REUSE; /* SO_REUSEADDR */
 
        sock->sk->sk_allocation = GFP_NOIO;
        msock->sk->sk_allocation = GFP_NOIO;