diff options
| -rw-r--r-- | drivers/staging/rdma/hfi1/qp.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rdma/hfi1/rc.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rdma/hfi1/verbs.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/rdma/hfi1/qp.c b/drivers/staging/rdma/hfi1/qp.c index b78c8eadcd95..a5f0e2e41eb1 100644 --- a/drivers/staging/rdma/hfi1/qp.c +++ b/drivers/staging/rdma/hfi1/qp.c @@ -607,7 +607,7 @@ void *qp_priv_alloc(struct rvt_dev_info *rdi, struct rvt_qp *qp, kfree(priv); return ERR_PTR(-ENOMEM); } - + setup_timer(&priv->s_rnr_timer, hfi1_rc_rnr_retry, (unsigned long)qp); return priv; } diff --git a/drivers/staging/rdma/hfi1/rc.c b/drivers/staging/rdma/hfi1/rc.c index 700d84942afe..1ff19aa41ef4 100644 --- a/drivers/staging/rdma/hfi1/rc.c +++ b/drivers/staging/rdma/hfi1/rc.c @@ -164,7 +164,7 @@ static inline int hfi1_stop_rnr_timer(struct rvt_qp *qp) * hfi1_del_timers_sync - wait for any timeout routines to exit * @qp - the QP */ -static inline void hfi1_del_timers_sync(struct rvt_qp *qp) +void hfi1_del_timers_sync(struct rvt_qp *qp) { del_timer_sync(&qp->s_timer); } diff --git a/drivers/staging/rdma/hfi1/verbs.h b/drivers/staging/rdma/hfi1/verbs.h index 335e3a8583e7..6294fa81c20b 100644 --- a/drivers/staging/rdma/hfi1/verbs.h +++ b/drivers/staging/rdma/hfi1/verbs.h @@ -210,6 +210,7 @@ struct hfi1_qp_priv { u8 s_sc; /* SC[0..4] for next packet */ u8 r_adefered; /* number of acks defered */ struct iowait s_iowait; + struct timer_list s_rnr_timer; struct rvt_qp *owner; }; @@ -403,6 +404,7 @@ u8 ah_to_sc(struct ib_device *ibdev, struct ib_ah_attr *ah_attr); struct ib_ah *hfi1_create_qp0_ah(struct hfi1_ibport *ibp, u16 dlid); void hfi1_rc_rnr_retry(unsigned long arg); +void hfi1_del_timers_sync(struct rvt_qp *qp); void hfi1_rc_send_complete(struct rvt_qp *qp, struct hfi1_ib_header *hdr); |