diff options
| author | Geliang Tang <tanggeliang@kylinos.cn> | 2024-03-12 14:07:35 +0800 |
|---|---|---|
| committer | Geliang Tang <tanggeliang@kylinos.cn> | 2024-04-22 10:56:55 +0800 |
| commit | 307afa08d378036b229c7aa16c6a46c66d6f7614 (patch) | |
| tree | e6b4782561107a71bf6ba618e938abcabf22e25d | |
| parent | 15e175ffbd63afdf62754079d80eedbdbe94fe4c (diff) | |
| download | mptcp_net-next-307afa08d378036b229c7aa16c6a46c66d6f7614.tar.gz | |
mptcp: drop 'first' in __mptcp_subflow_push_pending
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
| -rw-r--r-- | net/mptcp/protocol.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 7598f251a94f6b..9265a485d8c796 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1642,7 +1642,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned int flags) mptcp_check_send_data_fin(sk); } -static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk, bool first) +static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk) { struct mptcp_sock *msk = mptcp_sk(sk); struct mptcp_sendmsg_info info = { @@ -1657,19 +1657,6 @@ static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk, bool struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk); int ret = 0; - /* check for a different subflow usage only after - * spooling the first chunk of data - */ - if (first) { - mptcp_subflow_set_scheduled(subflow, false); - ret = __subflow_push_pending(sk, ssk, &info); - first = false; - if (ret <= 0) - break; - copied += ret; - continue; - } - if (mptcp_sched_get_send(msk)) goto out; @@ -3417,7 +3404,7 @@ void __mptcp_check_push(struct sock *sk, struct sock *ssk) return; if (!sock_owned_by_user(sk)) - __mptcp_subflow_push_pending(sk, ssk, false); + __mptcp_subflow_push_pending(sk, ssk); else __set_bit(MPTCP_PUSH_PENDING, &mptcp_sk(sk)->cb_flags); } @@ -3515,7 +3502,7 @@ void mptcp_subflow_process_delegated(struct sock *ssk, long status) if (status & BIT(MPTCP_DELEGATE_SEND)) { mptcp_data_lock(sk); if (!sock_owned_by_user(sk)) - __mptcp_subflow_push_pending(sk, ssk, true); + __mptcp_subflow_push_pending(sk, ssk); else __set_bit(MPTCP_PUSH_PENDING, &mptcp_sk(sk)->cb_flags); mptcp_data_unlock(sk); |