From: Amir Vadai Date: Wed, 2 Dec 2009 14:35:51 +0000 (+0200) Subject: sdp: fix a warning in RH4.0 X-Git-Tag: v4.1.12-92~264^2~5^2~231 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e5739b807fc46973ae0ce87dd6362c9b4d9de0a0;p=users%2Fjedix%2Flinux-maple.git sdp: fix a warning in RH4.0 never del uninitialized timer Signed-off-by: Amir Vadai --- diff --git a/drivers/infiniband/ulp/sdp/sdp_main.c b/drivers/infiniband/ulp/sdp/sdp_main.c index eab89a69308d..732398e3937b 100644 --- a/drivers/infiniband/ulp/sdp/sdp_main.c +++ b/drivers/infiniband/ulp/sdp/sdp_main.c @@ -256,8 +256,6 @@ out: static void sdp_init_keepalive_timer(struct sock *sk) { - init_timer(&sk->sk_timer); - sk->sk_timer.function = sdp_keepalive_timer; sk->sk_timer.data = (unsigned long)sk; } @@ -1084,6 +1082,10 @@ int sdp_init_sock(struct sock *sk) ssk->tx_ring.rdma_inflight = NULL; + init_timer(&ssk->tx_ring.timer); + init_timer(&ssk->nagle_timer); + init_timer(&sk->sk_timer); + return 0; } diff --git a/drivers/infiniband/ulp/sdp/sdp_tx.c b/drivers/infiniband/ulp/sdp/sdp_tx.c index eae49df1a52b..0d3b0de38bb8 100644 --- a/drivers/infiniband/ulp/sdp/sdp_tx.c +++ b/drivers/infiniband/ulp/sdp/sdp_tx.c @@ -493,7 +493,6 @@ int sdp_tx_ring_create(struct sdp_sock *ssk, struct ib_device *device) sdp_sk(&ssk->isk.sk)->tx_ring.cq = tx_cq; - init_timer(&ssk->tx_ring.timer); ssk->tx_ring.timer.function = sdp_poll_tx_timeout; ssk->tx_ring.timer.data = (unsigned long) ssk; ssk->tx_ring.poll_cnt = 0; @@ -501,7 +500,6 @@ int sdp_tx_ring_create(struct sdp_sock *ssk, struct ib_device *device) tasklet_init(&ssk->tx_ring.tasklet, sdp_poll_tx_timeout, (unsigned long) ssk); - init_timer(&ssk->nagle_timer); ssk->nagle_timer.function = sdp_nagle_timeout; ssk->nagle_timer.data = (unsigned long) ssk;