diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2021-06-21 15:54:36 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-22 09:57:45 -0700 |
| commit | 8cfc47fc2eb0fd2d6eaa9e4b23b4bf6ef1bfaeef (patch) | |
| tree | f849faaff47a43151ae2729b6139079ddabdeaa6 | |
| parent | 3c90e377a1e87a35a7f868ed1c53ea4d62379a8d (diff) | |
| download | linux-rpi-8cfc47fc2eb0fd2d6eaa9e4b23b4bf6ef1bfaeef.tar.gz linux-rpi-8cfc47fc2eb0fd2d6eaa9e4b23b4bf6ef1bfaeef.tar.bz2 linux-rpi-8cfc47fc2eb0fd2d6eaa9e4b23b4bf6ef1bfaeef.zip | |
mptcp: drop redundant test in move_skbs_to_msk()
Currently we check the msk state to avoid enqueuing new
skbs at msk shutdown time.
Such test is racy - as we can't acquire the msk socket lock -
and useless, as the caller already checked the subflow
field 'disposable', covering the same scenario in a race
free manner - read and updated under the ssk socket lock.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/mptcp/protocol.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 3e088e9d20fd..cf75be02eb00 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -686,9 +686,6 @@ static bool move_skbs_to_msk(struct mptcp_sock *msk, struct sock *ssk) struct sock *sk = (struct sock *)msk; unsigned int moved = 0; - if (inet_sk_state_load(sk) == TCP_CLOSE) - return false; - __mptcp_move_skbs_from_subflow(msk, ssk, &moved); __mptcp_ofo_queue(msk); if (unlikely(ssk->sk_err)) { |