From 4c941b026b37db2d56d6dda365aeb4826d82af96 Mon Sep 17 00:00:00 2001 From: Eddie Wai Date: Wed, 24 Feb 2010 14:42:05 +0000 Subject: [PATCH] --- yaml --- r: 184511 b: refs/heads/master c: 66883e90eaa0dd55d395c0f9a0c6da5d50809804 h: refs/heads/master i: 184509: d6ff4d5d594f5e2598f63345e7c83f9188d3cbaf 184507: 7ae0a0c293a58e68076a421f8dd87a4ba5abfe5a 184503: bfe514855f00f6adbe8b1968c8d6e5979c92aa66 184495: dac8ecbf257c8a51c7d5a9af6de4926d0fd57664 184479: 49380d8616b593c1412dd4f9452fb93ca0f2135b 184447: 74163b7ec6ed2b6b0e15826c5632cb1987ba6df7 v: v3 --- [refs] | 2 +- trunk/drivers/net/cnic.c | 21 ++++++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 2e9df459e851..de3d6a7dfa4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9736c086cc6221659e498f0855152c32dbc1396 +refs/heads/master: 66883e90eaa0dd55d395c0f9a0c6da5d50809804 diff --git a/trunk/drivers/net/cnic.c b/trunk/drivers/net/cnic.c index 0fe83717967a..40865aac2afa 100644 --- a/trunk/drivers/net/cnic.c +++ b/trunk/drivers/net/cnic.c @@ -3108,7 +3108,10 @@ static void cnic_cm_process_kcqe(struct cnic_dev *dev, struct kcqe *kcqe) break; case L4_KCQE_OPCODE_VALUE_RESET_RECEIVED: - if (test_and_clear_bit(SK_F_OFFLD_COMPLETE, &csk->flags)) + if (test_bit(CNIC_F_BNX2_CLASS, &dev->flags)) { + cnic_cm_upcall(cp, csk, opcode); + break; + } else if (test_and_clear_bit(SK_F_OFFLD_COMPLETE, &csk->flags)) csk->state = opcode; /* fall through */ case L4_KCQE_OPCODE_VALUE_CLOSE_COMP: @@ -3172,6 +3175,16 @@ static int cnic_ready_to_close(struct cnic_sock *csk, u32 opcode) if (!test_and_set_bit(SK_F_CLOSING, &csk->flags)) return 1; } + /* 57710+ only workaround to handle unsolicited RESET_COMP + * which will be treated like a RESET RCVD notification + * which triggers the clean up procedure + */ + else if (opcode == L4_KCQE_OPCODE_VALUE_RESET_COMP) { + if (!test_and_set_bit(SK_F_CLOSING, &csk->flags)) { + csk->state = L4_KCQE_OPCODE_VALUE_RESET_RECEIVED; + return 1; + } + } return 0; } @@ -3181,10 +3194,8 @@ static void cnic_close_bnx2_conn(struct cnic_sock *csk, u32 opcode) struct cnic_local *cp = dev->cnic_priv; clear_bit(SK_F_CONNECT_START, &csk->flags); - if (cnic_ready_to_close(csk, opcode)) { - cnic_close_conn(csk); - cnic_cm_upcall(cp, csk, opcode); - } + cnic_close_conn(csk); + cnic_cm_upcall(cp, csk, opcode); } static void cnic_cm_stop_bnx2_hw(struct cnic_dev *dev)