Skip to content

Commit

Permalink
mptcp: Only use subflow EOF signaling on fallback connections
Browse files Browse the repository at this point in the history
The MPTCP state machine handles disconnections on non-fallback connections,
but the mptcp_sock still needs to get notified when fallback subflows
disconnect.

Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Mat Martineau authored and David S. Miller committed Jul 29, 2020
1 parent 43b54c6 commit 067a0b3
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion net/mptcp/subflow.c
Original file line number Diff line number Diff line change
@@ -1159,7 +1159,8 @@ static void subflow_state_change(struct sock *sk)
if (mptcp_subflow_data_available(sk))
mptcp_data_ready(parent, sk);

if (!(parent->sk_shutdown & RCV_SHUTDOWN) &&
if (__mptcp_check_fallback(mptcp_sk(parent)) &&
!(parent->sk_shutdown & RCV_SHUTDOWN) &&
!subflow->rx_eof && subflow_is_done(sk)) {
subflow->rx_eof = 1;
mptcp_subflow_eof(parent);

0 comments on commit 067a0b3

Please sign in to comment.