diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2021-02-12 00:30:41 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-02-12 03:30:54 +0100 |
| commit | e3859603ba13e7545372b76ab08436993d540a5a (patch) | |
| tree | 9b23d10ad2ad28402ac67ec7a04defc4b989dad5 /net/mptcp/protocol.h | |
| parent | mptcp: init mptcp request socket earlier (diff) | |
| download | linux-e3859603ba13e7545372b76ab08436993d540a5a.tar.xz linux-e3859603ba13e7545372b76ab08436993d540a5a.zip | |
mptcp: better msk receive window updates
Move mptcp_cleanup_rbuf() related checks inside the mentioned
helper and extend them to mirror TCP checks more closely.
Additionally drop the 'rmem_pending' hack, since commit 879526030c8b
("mptcp: protect the rx path with the msk socket spinlock") we
can use instead 'rmem_released'.
Fixes: ea4ca586b16f ("mptcp: refine MPTCP-level ack scheduling")
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>
Diffstat (limited to 'net/mptcp/protocol.h')
| -rw-r--r-- | net/mptcp/protocol.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 6a164add5b6f..8d9f0ff10cb8 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -234,7 +234,6 @@ struct mptcp_sock { u64 wnd_end; unsigned long timer_ival; u32 token; - int rmem_pending; int rmem_released; unsigned long flags; bool can_ack; @@ -293,7 +292,7 @@ static inline struct mptcp_sock *mptcp_sk(const struct sock *sk) static inline int __mptcp_space(const struct sock *sk) { - return tcp_space(sk) + READ_ONCE(mptcp_sk(sk)->rmem_pending); + return tcp_space(sk) + READ_ONCE(mptcp_sk(sk)->rmem_released); } static inline struct mptcp_data_frag *mptcp_send_head(const struct sock *sk) |