projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drbd-8.4_ed6' into for-3.8-drivers-drbd-8.4_ed6
[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 813759f1b6adada6c520a5eeda9056c4396f3aa9..0331ad0b61e18583fb8f5fc5b768134eba0fd6ad 100644
(file)
--- a/
drivers/block/drbd/drbd_receiver.c
+++ b/
drivers/block/drbd/drbd_receiver.c
@@
-699,7
+699,7
@@
static int prepare_listen_socket(struct drbd_tconn *tconn, struct accept_wait_da
goto out;
}
goto out;
}
- s_listen->sk->sk_reuse =
1
; /* SO_REUSEADDR */
+ s_listen->sk->sk_reuse =
SK_CAN_REUSE
; /* SO_REUSEADDR */
drbd_setbufsize(s_listen, sndbuf_size, rcvbuf_size);
what = "bind before listen";
drbd_setbufsize(s_listen, sndbuf_size, rcvbuf_size);
what = "bind before listen";
@@
-974,8
+974,8
@@
randomize:
if (ad.s_listen)
sock_release(ad.s_listen);
if (ad.s_listen)
sock_release(ad.s_listen);
- sock.socket->sk->sk_reuse =
1
; /* SO_REUSEADDR */
- msock.socket->sk->sk_reuse =
1
; /* SO_REUSEADDR */
+ sock.socket->sk->sk_reuse =
SK_CAN_REUSE
; /* SO_REUSEADDR */
+ msock.socket->sk->sk_reuse =
SK_CAN_REUSE
; /* SO_REUSEADDR */
sock.socket->sk->sk_allocation = GFP_NOIO;
msock.socket->sk->sk_allocation = GFP_NOIO;
sock.socket->sk->sk_allocation = GFP_NOIO;
msock.socket->sk->sk_allocation = GFP_NOIO;