From d60fda21d9c788cc6c172e39faf4f6e35d63fca4 Mon Sep 17 00:00:00 2001 From: Eldad Zinger Date: Mon, 13 Sep 2010 15:20:28 +0200 Subject: [PATCH] sdp: fix keepalive timer setup for server-sockets Signed-off-by: Eldad Zinger --- drivers/infiniband/ulp/sdp/sdp_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/infiniband/ulp/sdp/sdp_main.c b/drivers/infiniband/ulp/sdp/sdp_main.c index 055dd9176244..0ba25ef5bda4 100644 --- a/drivers/infiniband/ulp/sdp/sdp_main.c +++ b/drivers/infiniband/ulp/sdp/sdp_main.c @@ -1140,6 +1140,7 @@ int sdp_init_sock(struct sock *sk) init_timer(&ssk->tx_ring.timer); init_timer(&ssk->nagle_timer); init_timer(&sk->sk_timer); + setup_timer(&sk->sk_timer, sdp_keepalive_timer, (unsigned long)sk); ssk->sa_cancel_arrived = 0; ssk->zcopy_thresh = -1; /* use global sdp_zcopy_thresh */ ssk->last_bind_err = 0; @@ -2760,9 +2761,6 @@ static int sdp_create_socket(struct net *net, struct socket *sock, int protocol) } sk->sk_destruct = sdp_destruct; - - setup_timer(&sk->sk_timer, sdp_keepalive_timer, (unsigned long)sk); - sock->ops = &sdp_proto_ops; sock->state = SS_UNCONNECTED; -- 2.50.1