net/smc: correct state change for peer closing
If some kind of closing is received from the peer while still in state SMC_INIT, it means the peer has had an active connection and closed the socket quickly before listen_work finished. This should not result in a shortcut from state SMC_INIT to state SMC_CLOSED. This patch adds the socket to the accept queue in state SMC_APPCLOSEWAIT1. The socket reaches state SMC_CLOSED once being accepted and closed with smc_release(). Signed-off-by: Ursula Braun <ubraun@linux.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
a5e04318c8
commit
84b799a292
|
@ -345,14 +345,7 @@ static void smc_close_passive_work(struct work_struct *work)
|
||||||
|
|
||||||
switch (sk->sk_state) {
|
switch (sk->sk_state) {
|
||||||
case SMC_INIT:
|
case SMC_INIT:
|
||||||
if (atomic_read(&conn->bytes_to_rcv) ||
|
|
||||||
(rxflags->peer_done_writing &&
|
|
||||||
!smc_cdc_rxed_any_close(conn))) {
|
|
||||||
sk->sk_state = SMC_APPCLOSEWAIT1;
|
sk->sk_state = SMC_APPCLOSEWAIT1;
|
||||||
} else {
|
|
||||||
sk->sk_state = SMC_CLOSED;
|
|
||||||
sock_put(sk); /* passive closing */
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case SMC_ACTIVE:
|
case SMC_ACTIVE:
|
||||||
sk->sk_state = SMC_APPCLOSEWAIT1;
|
sk->sk_state = SMC_APPCLOSEWAIT1;
|
||||||
|
|
Loading…
Reference in New Issue