From 6445cff00277d240a55c06c2a6da1d7c94aff883 Mon Sep 17 00:00:00 2001 From: Tatyana Nikolova Date: Mon, 5 Dec 2011 11:39:12 -0600 Subject: [PATCH] --- yaml --- r: 280599 b: refs/heads/master c: 196f40c8464799d185ee7417d2ee532468b374e6 h: refs/heads/master i: 280597: 98abddec10ae05c12700efc378f0aff021850c0c 280595: ca0e91c2d98e8643f112efe073a6472c183e86ff 280591: 1d72dc40a3896656cc7e07223bdc5cc18f3be165 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/nes/nes_cm.c | 1 + trunk/drivers/infiniband/hw/nes/nes_hw.c | 4 ---- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7cf02d132cde..8344f59f3f77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0fda90f2a8eeac269833e7ef9e32d199747072b +refs/heads/master: 196f40c8464799d185ee7417d2ee532468b374e6 diff --git a/trunk/drivers/infiniband/hw/nes/nes_cm.c b/trunk/drivers/infiniband/hw/nes/nes_cm.c index 0a52d72371ee..db0831dc533c 100644 --- a/trunk/drivers/infiniband/hw/nes/nes_cm.c +++ b/trunk/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; diff --git a/trunk/drivers/infiniband/hw/nes/nes_hw.c b/trunk/drivers/infiniband/hw/nes/nes_hw.c index 6ee570baa60a..055f4b545df0 100644 --- a/trunk/drivers/infiniband/hw/nes/nes_hw.c +++ b/trunk/drivers/infiniband/hw/nes/nes_hw.c @@ -3619,10 +3619,6 @@ static void nes_process_iwarp_aeqe(struct nes_device *nesdev, } break; case NES_AEQE_AEID_LLP_CLOSE_COMPLETE: - if (nesqp->term_flags) { - nes_terminate_done(nesqp, 0); - return; - } spin_lock_irqsave(&nesqp->lock, flags); nesqp->hw_iwarp_state = iwarp_state; nesqp->hw_tcp_state = tcp_state;