diff options
| author |   Michael Chan <mchan@broadcom.com> | 2010-06-15 08:57:02 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-06-15 14:23:37 -0700 |
| commit | 943189f1d564e69201f7d71e77f5608a701e3e55 (patch) | |
| tree | 4fd0bf3864af8a117e0b99f31af17a4aa61b36a7 /drivers/net/cnic.c | |
| parent | cnic: Refactor code in cnic_cm_process_kcqe(). (diff) | |
| download | linux-dev-943189f1d564e69201f7d71e77f5608a701e3e55.tar.xz linux-dev-943189f1d564e69201f7d71e77f5608a701e3e55.zip | |
cnic: Refactor and fix cnic_ready_to_close().
Combine RESET_RECEIVED and RESET_COMP logic and fix race condition
between these 2 events and cnic_cm_close(). In particular, we need
to (test_and_clear_bit(SK_F_OFFLD_COMPLETE, &csk->flags)) before we
update csk->state.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: Eddie Wai <waie@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/cnic.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c index 48fdbceb2181..11eeded146d9 100644 --- a/drivers/net/cnic.c +++ b/drivers/net/cnic.c @@ -3198,25 +3198,19 @@ static int cnic_cm_alloc_mem(struct cnic_dev *dev) static int cnic_ready_to_close(struct cnic_sock *csk, u32 opcode) { - if (opcode == L4_KCQE_OPCODE_VALUE_RESET_RECEIVED) { - if (test_and_clear_bit(SK_F_OFFLD_COMPLETE, &csk->flags)) - csk->state = opcode; - } - if ((opcode == csk->state) || - (opcode == L4_KCQE_OPCODE_VALUE_RESET_RECEIVED && - csk->state == L4_KCQE_OPCODE_VALUE_CLOSE_COMP)) { - if (!test_and_set_bit(SK_F_CLOSING, &csk->flags)) - return 1; + if (test_and_clear_bit(SK_F_OFFLD_COMPLETE, &csk->flags)) { + /* Unsolicited RESET_COMP or RESET_RECEIVED */ + opcode = L4_KCQE_OPCODE_VALUE_RESET_RECEIVED; + csk->state = opcode; } - /* 57710+ only workaround to handle unsolicited RESET_COMP - * which will be treated like a RESET RCVD notification - * which triggers the clean up procedure + + /* 1. If event opcode matches the expected event in csk->state + * 2. If the expected event is CLOSE_COMP, we accept any event */ - 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; + if (opcode == csk->state || + csk->state == L4_KCQE_OPCODE_VALUE_CLOSE_COMP) { + if (!test_and_set_bit(SK_F_CLOSING, &csk->flags)) return 1; - } } return 0; } |