diff options
| author |   Florian Westphal <fw@strlen.de> | 2020-04-02 13:44:52 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-04-02 06:59:21 -0700 |
| commit | 59832e246515ab6a4f5aa878073e6f415aa35166 (patch) | |
| tree | 770b4daa78779200fc64f1538caea67491e4810b /net/mptcp/subflow.c | |
| parent | mptcp: fix tcp fallback crash (diff) | |
| download | linux-dev-59832e246515ab6a4f5aa878073e6f415aa35166.tar.xz linux-dev-59832e246515ab6a4f5aa878073e6f415aa35166.zip | |
mptcp: subflow: check parent mptcp socket on subflow state change
This is needed at least until proper MPTCP-Level fin/reset
signalling gets added:
We wake parent when a subflow changes, but we should do this only
when all subflows have closed, not just one.
Schedule the mptcp worker and tell it to check eof state on all
subflows.
Only flag mptcp socket as closed and wake userspace processes blocking
in poll if all subflows have closed.
Co-developed-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mptcp/subflow.c')
| -rw-r--r-- | net/mptcp/subflow.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index b5180c81588e..50a8bea987c6 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -994,8 +994,7 @@ static void subflow_state_change(struct sock *sk) if (!(parent->sk_shutdown & RCV_SHUTDOWN) && !subflow->rx_eof && subflow_is_done(sk)) { subflow->rx_eof = 1; - parent->sk_shutdown |= RCV_SHUTDOWN; - __subflow_state_change(parent); + mptcp_subflow_eof(parent); } } |