diff options
author | Tatyana Nikolova <Tatyana.E.Nikolova@intel.com> | 2012-12-06 14:58:27 -0500 |
---|---|---|
committer | Roland Dreier <roland@purestorage.com> | 2012-12-08 03:31:02 -0500 |
commit | 7bfcfa51c35cdd2d37e0d70fc11790642dd11fb3 (patch) | |
tree | 5f14eb0d107f2f4a0730144637d07c8f42c76deb /drivers/infiniband/hw/nes/nes_verbs.c | |
parent | 00ad255d17c2d12a035370836cb93630711d48ca (diff) |
RDMA/nes: Fix for terminate timer crash
The terminate timer needs to be initialized just once.
Signed-off-by: Tatyana Nikolova <Tatyana.E.Nikolova@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/hw/nes/nes_verbs.c')
-rw-r--r-- | drivers/infiniband/hw/nes/nes_verbs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c index cd0ecb215cca..c47ec2599bc9 100644 --- a/drivers/infiniband/hw/nes/nes_verbs.c +++ b/drivers/infiniband/hw/nes/nes_verbs.c | |||
@@ -1404,6 +1404,9 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd, | |||
1404 | } | 1404 | } |
1405 | 1405 | ||
1406 | nesqp->sig_all = (init_attr->sq_sig_type == IB_SIGNAL_ALL_WR); | 1406 | nesqp->sig_all = (init_attr->sq_sig_type == IB_SIGNAL_ALL_WR); |
1407 | init_timer(&nesqp->terminate_timer); | ||
1408 | nesqp->terminate_timer.function = nes_terminate_timeout; | ||
1409 | nesqp->terminate_timer.data = (unsigned long)nesqp; | ||
1407 | 1410 | ||
1408 | /* update the QP table */ | 1411 | /* update the QP table */ |
1409 | nesdev->nesadapter->qp_table[nesqp->hwqp.qp_id-NES_FIRST_QPN] = nesqp; | 1412 | nesdev->nesadapter->qp_table[nesqp->hwqp.qp_id-NES_FIRST_QPN] = nesqp; |
@@ -1413,7 +1416,6 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd, | |||
1413 | return &nesqp->ibqp; | 1416 | return &nesqp->ibqp; |
1414 | } | 1417 | } |
1415 | 1418 | ||
1416 | |||
1417 | /** | 1419 | /** |
1418 | * nes_clean_cq | 1420 | * nes_clean_cq |
1419 | */ | 1421 | */ |