From: Eldad Zinger Date: Sun, 18 Apr 2010 13:56:03 +0000 (+0300) Subject: sdp: BUG2017 - better initialization implementation for ssk->nagle_timer X-Git-Tag: v4.1.12-92~264^2~5^2~196 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5191d8f5b06c2187d2f223c21c7b18e86b826331;p=users%2Fjedix%2Flinux-maple.git sdp: BUG2017 - better initialization implementation for ssk->nagle_timer Signed-off-by: Eldad Zinger --- diff --git a/drivers/infiniband/ulp/sdp/sdp_tx.c b/drivers/infiniband/ulp/sdp/sdp_tx.c index d816f32c598cd..7d476845cedea 100644 --- a/drivers/infiniband/ulp/sdp/sdp_tx.c +++ b/drivers/infiniband/ulp/sdp/sdp_tx.c @@ -506,8 +506,7 @@ 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); - ssk->nagle_timer.function = sdp_nagle_timeout; - ssk->nagle_timer.data = (unsigned long) ssk; + setup_timer(&ssk->nagle_timer, sdp_nagle_timeout, (unsigned long) ssk); return 0;