Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bfbea74 authored by Kees Cook's avatar Kees Cook Committed by Doug Ledford
Browse files

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: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 5a3dc323

drivers/infiniband/sw/rxe/rxe_comp.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/infiniband/sw/rxe/rxe_loc.h

+2 −2
Original line number Diff line number Diff line
@@ -218,8 +218,8 @@ static inline void rxe_advance_resp_resource(struct rxe_qp *qp) 
		qp->resp.res_head = 0;

}



void retransmit_timer(unsigned long data);

void rnr_nak_timer(unsigned long data);

void retransmit_timer(struct timer_list *t);

void rnr_nak_timer(struct timer_list *t);



/* rxe_srq.c */

#define IB_SRQ_INIT_MASK (~IB_SRQ_LIMIT)

drivers/infiniband/sw/rxe/rxe_qp.c

+2 −2
Original line number Diff line number Diff line
@@ -275,8 +275,8 @@ static int rxe_qp_init_req(struct rxe_dev *rxe, struct rxe_qp *qp, 


	qp->qp_timeout_jiffies = 0; /* Can't be set for UD/UC in modify_qp */

	if (init->qp_type == IB_QPT_RC) {

		setup_timer(&qp->rnr_nak_timer, rnr_nak_timer, (unsigned long)qp);

		setup_timer(&qp->retrans_timer, retransmit_timer, (unsigned long)qp);

		timer_setup(&qp->rnr_nak_timer, rnr_nak_timer, 0);

		timer_setup(&qp->retrans_timer, retransmit_timer, 0);

	}

	return 0;

}

drivers/infiniband/sw/rxe/rxe_req.c

+2 −2
Original line number Diff line number Diff line
@@ -118,9 +118,9 @@ static void req_retry(struct rxe_qp *qp) 
	}

}



void rnr_nak_timer(unsigned long data)

void rnr_nak_timer(struct timer_list *t)

{

	struct rxe_qp *qp = (struct rxe_qp *)data;

	struct rxe_qp *qp = from_timer(qp, t, rnr_nak_timer);



	pr_debug("qp#%d rnr nak timer fired\n", qp_num(qp));

	rxe_run_task(&qp->req.task, 1);