summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/sw/rxe/rxe_comp.c
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-24 03:28:27 -0700
committerDoug Ledford <dledford@redhat.com>2017-10-25 15:24:49 -0400
commit3bfbea747353c2b40b48784b70e782ca5352f18c (patch)
treee31cec1ff826c50bbd57538824f6357039fce6d0 /drivers/infiniband/sw/rxe/rxe_comp.c
parent5a3dc32372439eb9a0d6027c54cbfff64803fce5 (diff)
downloadlinux-3bfbea747353c2b40b48784b70e782ca5352f18c.tar.gz
linux-3bfbea747353c2b40b48784b70e782ca5352f18c.tar.bz2
linux-3bfbea747353c2b40b48784b70e782ca5352f18c.zip
IB/rxe: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. Cc: Moni Shoua <monis@mellanox.com> Cc: Doug Ledford <dledford@redhat.com> Cc: Sean Hefty <sean.hefty@intel.com> Cc: Hal Rosenstock <hal.rosenstock@gmail.com> Cc: linux-rdma@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/sw/rxe/rxe_comp.c')
-rw-r--r--drivers/infiniband/sw/rxe/rxe_comp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/sw/rxe/rxe_comp.c b/drivers/infiniband/sw/rxe/rxe_comp.c
index ff64875e3d15..6cdc40ed8a9f 100644
--- a/drivers/infiniband/sw/rxe/rxe_comp.c
+++ b/drivers/infiniband/sw/rxe/rxe_comp.c
@@ -136,9 +136,9 @@ static enum ib_wc_opcode wr_to_wc_opcode(enum ib_wr_opcode opcode)
}
}
-void retransmit_timer(unsigned long data)
+void retransmit_timer(struct timer_list *t)
{
- struct rxe_qp *qp = (struct rxe_qp *)data;
+ struct rxe_qp *qp = from_timer(qp, t, retrans_timer);
if (qp->valid) {
qp->comp.timeout = 1;