Skip to content

Commit 5b49c41

Browse files
matttbekuba-moo
authored andcommitted
mptcp: avoid printing warning once on client side
After the 'Fixes' commit mentioned below, the client side might print the following warning once when a subflow is fully established at the reception of any valid additional ack: MPTCP: bogus mpc option on established client sk That's a normal situation, and no warning should be printed for that. We can then skip the check when the label is used. Fixes: e4a0fa4 ("mptcp: corner case locking for rx path fields initialization") Cc: [email protected] Suggested-by: Paolo Abeni <[email protected]> Reviewed-by: Mat Martineau <[email protected]> Signed-off-by: Matthieu Baerts (NGI0) <[email protected]> Link: https://lore.kernel.org/r/20240223-upstream-net-20240223-misc-fixes-v1-3-162e87e48497@kernel.org Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 7092dbe commit 5b49c41

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/mptcp/options.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -981,10 +981,10 @@ static bool check_fully_established(struct mptcp_sock *msk, struct sock *ssk,
981981
if (mp_opt->deny_join_id0)
982982
WRITE_ONCE(msk->pm.remote_deny_join_id0, true);
983983

984-
set_fully_established:
985984
if (unlikely(!READ_ONCE(msk->pm.server_side)))
986985
pr_warn_once("bogus mpc option on established client sk");
987986

987+
set_fully_established:
988988
mptcp_data_lock((struct sock *)msk);
989989
__mptcp_subflow_fully_established(msk, subflow, mp_opt);
990990
mptcp_data_unlock((struct sock *)msk);

0 commit comments

Comments
 (0)