mptcp: use mptcp_win_from_space helper
authorGeliang Tang <tanggeliang@kylinos.cn>
Wed, 5 Jun 2024 07:15:40 +0000 (09:15 +0200)
committerPaolo Abeni <pabeni@redhat.com>
Thu, 6 Jun 2024 13:13:47 +0000 (15:13 +0200)
The MPTCP dedicated win_from_space helper mptcp_win_from_space() is defined
in protocol.h, use it in mptcp_rcv_space_adjust() instead of using the TCP
one. Here scaling_ratio is the same as msk->scaling_ratio.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
net/mptcp/protocol.c

index 7d44196ec5b630500d28815fde9f92c0890c8314..546c80c6702a556b3e2415998ba104656a9897ca 100644 (file)
@@ -2046,7 +2046,7 @@ static void mptcp_rcv_space_adjust(struct mptcp_sock *msk, int copied)
                if (rcvbuf > sk->sk_rcvbuf) {
                        u32 window_clamp;
 
-                       window_clamp = __tcp_win_from_space(scaling_ratio, rcvbuf);
+                       window_clamp = mptcp_win_from_space(sk, rcvbuf);
                        WRITE_ONCE(sk->sk_rcvbuf, rcvbuf);
 
                        /* Make subflows follow along.  If we do not do this, we