mptcp: drop the push_pending field
authorPaolo Abeni <pabeni@redhat.com>
Thu, 8 Feb 2024 18:03:49 +0000 (19:03 +0100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 12 Feb 2024 10:08:12 +0000 (10:08 +0000)
commitbdd70eb68913c960acb895b00a8c62eb64715b1f
treeed426e596d2325aeac12427defcdd0638af8397f
parentbab091d54600b62c1246caa6075d98a24b2c9e03
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>
net/mptcp/protocol.c
net/mptcp/protocol.h