From 4cb014675723eee90bf1f7ab26e07b940f73647c Mon Sep 17 00:00:00 2001 From: Faisal Latif Date: Wed, 1 Sep 2010 15:43:11 +0000 Subject: [PATCH] --- yaml --- r: 210399 b: refs/heads/master c: 29da03b9d1c6f24548d98cebda1e15a25d80ee1b h: refs/heads/master i: 210397: 79dd30232cc66e6a313fb7f48be52b8975dfc422 210395: 1bbccd9e6a5e16dc524657408f4da094be0bcd76 210391: f8fdd628726eea05029b6e0caa8d70445d4ad69e 210383: 011e1561518b471da799e052dee91c82e2f6e55a 210367: 66b40c41df84fb34774cb68bc3fd8b4301a4516d v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/nes/nes_hw.c | 3 ++- trunk/drivers/infiniband/hw/nes/nes_hw.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 825cad671138..4c777cd52089 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67d70721151726286763209ecadc3fce86abfdce +refs/heads/master: 29da03b9d1c6f24548d98cebda1e15a25d80ee1b diff --git a/trunk/drivers/infiniband/hw/nes/nes_hw.c b/trunk/drivers/infiniband/hw/nes/nes_hw.c index ba93a8be6bf6..1980a461c499 100644 --- a/trunk/drivers/infiniband/hw/nes/nes_hw.c +++ b/trunk/drivers/infiniband/hw/nes/nes_hw.c @@ -3469,7 +3469,8 @@ static void nes_process_iwarp_aeqe(struct nes_device *nesdev, if (atomic_inc_return(&nesqp->close_timer_started) == 1) { if ((tcp_state == NES_AEQE_TCP_STATE_CLOSE_WAIT) && - (nesqp->ibqp_state == IB_QPS_RTS)) { + (nesqp->ibqp_state == IB_QPS_RTS) && + ((nesadapter->eeprom_version >> 16) != NES_A0)) { spin_lock_irqsave(&nesqp->lock, flags); nesqp->hw_iwarp_state = iwarp_state; nesqp->hw_tcp_state = tcp_state; diff --git a/trunk/drivers/infiniband/hw/nes/nes_hw.h b/trunk/drivers/infiniband/hw/nes/nes_hw.h index aa9183db32b1..1204c3432b63 100644 --- a/trunk/drivers/infiniband/hw/nes/nes_hw.h +++ b/trunk/drivers/infiniband/hw/nes/nes_hw.h @@ -45,6 +45,7 @@ #define NES_PHY_TYPE_KR 9 #define NES_MULTICAST_PF_MAX 8 +#define NES_A0 3 enum pci_regs { NES_INT_STAT = 0x0000,