diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2024-02-08 21:03:49 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2024-02-12 13:08:12 +0300 |
| commit | bdd70eb68913c960acb895b00a8c62eb64715b1f (patch) | |
| tree | ed426e596d2325aeac12427defcdd0638af8397f /net/mptcp/protocol.h | |
| parent | bab091d54600b62c1246caa6075d98a24b2c9e03 (diff) | |
| download | linux-bdd70eb68913c960acb895b00a8c62eb64715b1f.tar.xz | |
mptcp: drop the push_pending field
Such field is there to avoid acquiring the data lock in a few spots,
but it adds complexity to the already non trivial locking schema.
All the relevant call sites (mptcp-level re-injection, set socket
options), are slow-path, drop such field in favor of 'cb_flags', adding
the relevant locking.
This patch could be seen as an improvement, instead of a fix. But it
simplifies the next patch. The 'Fixes' tag has been added to help having
this series backported to stable.
Fixes: e9d09baca676 ("mptcp: avoid atomic bit manipulation when possible")
Cc: stable@vger.kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mptcp/protocol.h')
| -rw-r--r-- | net/mptcp/protocol.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 3517f2d24a22..b905f1868298 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -286,7 +286,6 @@ struct mptcp_sock { int rmem_released; unsigned long flags; unsigned long cb_flags; - unsigned long push_pending; bool recovery; /* closing subflow write queue reinjected */ bool can_ack; bool fully_established; |