|
@@ -2117,6 +2117,7 @@ static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
|
|
|
unsigned int keepidle = xprt->timeout->to_initval / HZ;
|
|
|
unsigned int keepcnt = xprt->timeout->to_retries + 1;
|
|
|
unsigned int opt_on = 1;
|
|
|
+ unsigned int timeo;
|
|
|
|
|
|
/* TCP Keepalive options */
|
|
|
kernel_setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
|
|
@@ -2128,6 +2129,12 @@ static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
|
|
|
kernel_setsockopt(sock, SOL_TCP, TCP_KEEPCNT,
|
|
|
(char *)&keepcnt, sizeof(keepcnt));
|
|
|
|
|
|
+ /* TCP user timeout (see RFC5482) */
|
|
|
+ timeo = jiffies_to_msecs(xprt->timeout->to_initval) *
|
|
|
+ (xprt->timeout->to_retries + 1);
|
|
|
+ kernel_setsockopt(sock, SOL_TCP, TCP_USER_TIMEOUT,
|
|
|
+ (char *)&timeo, sizeof(timeo));
|
|
|
+
|
|
|
write_lock_bh(&sk->sk_callback_lock);
|
|
|
|
|
|
xs_save_old_callbacks(transport, sk);
|