hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Chan 2010-06-15 08:57:02 +00:00 committed by David S. Miller
parent a1e621bf6d
commit 943189f1d5
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/net/cnic.c
View File

@ -3198,26 +3198,20 @@ static int cnic_cm_alloc_mem(struct cnic_dev *dev)
static int cnic_ready_to_close(struct cnic_sock *csk, u32 opcode) 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)) {
if (test_and_clear_bit(SK_F_OFFLD_COMPLETE, &csk->flags)) /* Unsolicited RESET_COMP or RESET_RECEIVED */
csk->state = opcode; opcode = L4_KCQE_OPCODE_VALUE_RESET_RECEIVED;
csk->state = opcode;
} }
if ((opcode == csk->state) ||
(opcode == L4_KCQE_OPCODE_VALUE_RESET_RECEIVED && /* 1. If event opcode matches the expected event in csk->state
csk->state == L4_KCQE_OPCODE_VALUE_CLOSE_COMP)) { * 2. If the expected event is CLOSE_COMP, we accept any event
*/
if (opcode == csk->state ||
csk->state == L4_KCQE_OPCODE_VALUE_CLOSE_COMP) {
if (!test_and_set_bit(SK_F_CLOSING, &csk->flags)) if (!test_and_set_bit(SK_F_CLOSING, &csk->flags))
return 1; 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; return 0;
} }