Commit 8b38217a authored by Maxim Galaganov's avatar Maxim Galaganov Committed by Jakub Kicinski
Browse files

mptcp: expose mptcp_check_and_set_pending 



Expose the mptcp_check_and_set_pending() function for use inside MPTCP
sockopt code. The next patch will call it when TCP_CORK is cleared or
TCP_NODELAY is set on the MPTCP socket in order to push pending data
from mptcp_release_cb().

Acked-by: default avatarPaolo Abeni <pabeni@redhat.com>
Reviewed-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarMaxim Galaganov <max@internet.ru>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 6fadaa56

net/mptcp/protocol.c

+1 −1
Original line number Diff line number Diff line
@@ -1502,7 +1502,7 @@ static void mptcp_update_post_push(struct mptcp_sock *msk, 
		msk->snd_nxt = snd_nxt_new;

}



static void mptcp_check_and_set_pending(struct sock *sk)

void mptcp_check_and_set_pending(struct sock *sk)

{

	if (mptcp_send_head(sk) &&

	    !test_bit(MPTCP_PUSH_PENDING, &mptcp_sk(sk)->flags))

net/mptcp/protocol.h

+1 −0
Original line number Diff line number Diff line
@@ -555,6 +555,7 @@ unsigned int mptcp_stale_loss_cnt(const struct net *net); 
void mptcp_subflow_fully_established(struct mptcp_subflow_context *subflow,

				     struct mptcp_options_received *mp_opt);

bool __mptcp_retransmit_pending_data(struct sock *sk);

void mptcp_check_and_set_pending(struct sock *sk);

void __mptcp_push_pending(struct sock *sk, unsigned int flags);

bool mptcp_subflow_data_available(struct sock *sk);

void __init mptcp_subflow_init(void);