aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/nes/nes_cm.c
diff options
context:
space:
mode:
authorTatyana Nikolova <Tatyana.E.Nikolova@intel.com>2011-12-05 11:39:12 -0600
committerRoland Dreier <roland@purestorage.com>2012-01-04 09:12:39 -0800
commit196f40c8464799d185ee7417d2ee532468b374e6 (patch)
treea5227c763d7803f1c46b068fa19c1898d02ef903 /drivers/infiniband/hw/nes/nes_cm.c
parentRDMA/nes: Make unnecessarily global nes_set_pau() static (diff)
downloadlinux-dev-196f40c8464799d185ee7417d2ee532468b374e6.tar.xz
linux-dev-196f40c8464799d185ee7417d2ee532468b374e6.zip
RDMA/nes: Fix terminate during AE
Fix for reset which happens right after sending a terminate message. Terminate timer is not deleted when the connection is closed. Signed-off-by: Tatyana Nikolova <Tatyana.E.Nikolova@intel.com> Signed-off-by: Faisal Latif <Faisal.Latif@intel.com> Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/hw/nes/nes_cm.c')
-rw-r--r--drivers/infiniband/hw/nes/nes_cm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index 0a52d72371ee..db0831dc533c 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -2838,6 +2838,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
issue_disconn = 1;
issue_close = 1;
nesqp->cm_id = NULL;
+ del_timer(&nesqp->terminate_timer);
if (nesqp->flush_issued == 0) {
nesqp->flush_issued = 1;
issue_flush = 1;