Commit 2ec46d68 authored by Kees Cook's avatar Kees Cook Committed by Doug Ledford

RDMA/i40iw: Convert timers to use timer_setup() (part 2)

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.

This includes the remaining timers missed in the earlier i40iw patch.

Cc: Faisal Latif <faisal.latif@intel.com>
Cc: Shiraz Saleem <shiraz.saleem@intel.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 051947b3
...@@ -1188,7 +1188,7 @@ static void i40iw_handle_close_entry(struct i40iw_cm_node *cm_node, u32 rem_node ...@@ -1188,7 +1188,7 @@ static void i40iw_handle_close_entry(struct i40iw_cm_node *cm_node, u32 rem_node
* i40iw_cm_timer_tick - system's timer expired callback * i40iw_cm_timer_tick - system's timer expired callback
* @pass: Pointing to cm_core * @pass: Pointing to cm_core
*/ */
static void i40iw_cm_timer_tick(unsigned long pass) static void i40iw_cm_timer_tick(struct timer_list *t)
{ {
unsigned long nexttimeout = jiffies + I40IW_LONG_TIME; unsigned long nexttimeout = jiffies + I40IW_LONG_TIME;
struct i40iw_cm_node *cm_node; struct i40iw_cm_node *cm_node;
...@@ -1196,7 +1196,7 @@ static void i40iw_cm_timer_tick(unsigned long pass) ...@@ -1196,7 +1196,7 @@ static void i40iw_cm_timer_tick(unsigned long pass)
struct list_head *list_core_temp; struct list_head *list_core_temp;
struct i40iw_sc_vsi *vsi; struct i40iw_sc_vsi *vsi;
struct list_head *list_node; struct list_head *list_node;
struct i40iw_cm_core *cm_core = (struct i40iw_cm_core *)pass; struct i40iw_cm_core *cm_core = from_timer(cm_core, t, tcp_timer);
u32 settimer = 0; u32 settimer = 0;
unsigned long timetosend; unsigned long timetosend;
struct i40iw_sc_dev *dev; struct i40iw_sc_dev *dev;
...@@ -3195,8 +3195,7 @@ void i40iw_setup_cm_core(struct i40iw_device *iwdev) ...@@ -3195,8 +3195,7 @@ void i40iw_setup_cm_core(struct i40iw_device *iwdev)
INIT_LIST_HEAD(&cm_core->connected_nodes); INIT_LIST_HEAD(&cm_core->connected_nodes);
INIT_LIST_HEAD(&cm_core->listen_nodes); INIT_LIST_HEAD(&cm_core->listen_nodes);
setup_timer(&cm_core->tcp_timer, i40iw_cm_timer_tick, timer_setup(&cm_core->tcp_timer, i40iw_cm_timer_tick, 0);
(unsigned long)cm_core);
spin_lock_init(&cm_core->ht_lock); spin_lock_init(&cm_core->ht_lock);
spin_lock_init(&cm_core->listen_list_lock); spin_lock_init(&cm_core->listen_list_lock);
......
...@@ -870,9 +870,9 @@ void i40iw_terminate_done(struct i40iw_sc_qp *qp, int timeout_occurred) ...@@ -870,9 +870,9 @@ void i40iw_terminate_done(struct i40iw_sc_qp *qp, int timeout_occurred)
* i40iw_terminate_imeout - timeout happened * i40iw_terminate_imeout - timeout happened
* @context: points to iwarp qp * @context: points to iwarp qp
*/ */
static void i40iw_terminate_timeout(unsigned long context) static void i40iw_terminate_timeout(struct timer_list *t)
{ {
struct i40iw_qp *iwqp = (struct i40iw_qp *)context; struct i40iw_qp *iwqp = from_timer(iwqp, t, terminate_timer);
struct i40iw_sc_qp *qp = (struct i40iw_sc_qp *)&iwqp->sc_qp; struct i40iw_sc_qp *qp = (struct i40iw_sc_qp *)&iwqp->sc_qp;
i40iw_terminate_done(qp, 1); i40iw_terminate_done(qp, 1);
...@@ -889,8 +889,7 @@ void i40iw_terminate_start_timer(struct i40iw_sc_qp *qp) ...@@ -889,8 +889,7 @@ void i40iw_terminate_start_timer(struct i40iw_sc_qp *qp)
iwqp = (struct i40iw_qp *)qp->back_qp; iwqp = (struct i40iw_qp *)qp->back_qp;
i40iw_add_ref(&iwqp->ibqp); i40iw_add_ref(&iwqp->ibqp);
setup_timer(&iwqp->terminate_timer, i40iw_terminate_timeout, timer_setup(&iwqp->terminate_timer, i40iw_terminate_timeout, 0);
(unsigned long)iwqp);
iwqp->terminate_timer.expires = jiffies + HZ; iwqp->terminate_timer.expires = jiffies + HZ;
add_timer(&iwqp->terminate_timer); add_timer(&iwqp->terminate_timer);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment