From: Eldad Zinger Date: Mon, 13 Sep 2010 13:20:28 +0000 (+0200) Subject: sdp: fix keepalive timer setup for server-sockets X-Git-Tag: v4.1.12-92~264^2~5^2~105 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d60fda21d9c788cc6c172e39faf4f6e35d63fca4;p=users%2Fjedix%2Flinux-maple.git sdp: fix keepalive timer setup for server-sockets Signed-off-by: Eldad Zinger --- diff --git a/drivers/infiniband/ulp/sdp/sdp_main.c b/drivers/infiniband/ulp/sdp/sdp_main.c index 055dd91762449..0ba25ef5bda4c 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;