Re: [MPTCP][PATCH mptcp-next] Squash to "mptcp: MP_FAIL suboption sending"

[Mat Martineau <mathew.j.martineau@linux.intel.com>]

On Wed, 28 Jul 2021, Geliang Tang wrote:

> From: Geliang Tang <geliangtang@xiaomi.com>
>
> Drop the use_ack check, and add a likely tag.
>
> Suggested-by: Paolo Abeni <pabeni@redhat.com>
> Signed-off-by: Geliang Tang <geliangtang@xiaomi.com>
> ---
> net/mptcp/options.c | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/net/mptcp/options.c b/net/mptcp/options.c
> index 2b15063c8009..6db24cf72ac0 100644
> --- a/net/mptcp/options.c
> +++ b/net/mptcp/options.c
> @@ -788,7 +788,7 @@ static bool mptcp_established_options_mp_fail(struct sock *sk,
> {
> 	struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
>
> -	if (!subflow->send_mp_fail)
> +	if (likely(!subflow->send_mp_fail))
> 		return false;
>
> 	if (remaining < TCPOLEN_MPTCP_FAIL)
> @@ -835,12 +835,10 @@ bool mptcp_established_options(struct sock *sk, struct sk_buff *skb,
> 		ret = true;
> 	else if (mptcp_established_options_dss(sk, skb, snd_data_fin, &opt_size, remaining, opts)) {
> 		ret = true;
> -		if (opts->ext_copy.use_ack) {
> -			if (mptcp_established_options_mp_fail(sk, &opt_size, remaining, opts)) {
> -				*size += opt_size;
> -				remaining -= opt_size;
> -				return true;
> -			}
> +		if (mptcp_established_options_mp_fail(sk, &opt_size, remaining, opts)) {
> +			*size += opt_size;
> +			remaining -= opt_size;
> +			return true;
> 		}
> 	}
>
> -- 
> 2.31.1

This looks fine. Please include in future MP_FAIL revs.

--
Mat Martineau
Intel