Re: [MPTCP][PATCH mptcp-next] Squash to "mptcp: add csum_reqd in mptcp_options_received"

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

On Fri, 7 May 2021, Geliang Tang wrote:

> Init csum_reqd in mptcp_get_options, keep mptcp_parse_option unchanged.
>
> Signed-off-by: Geliang Tang <geliangtang@gmail.com>
> ---
> net/mptcp/options.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)

Looks good to me, thanks.

-Mat


>
> diff --git a/net/mptcp/options.c b/net/mptcp/options.c
> index 4a74b8bb737f..527affbbeea9 100644
> --- a/net/mptcp/options.c
> +++ b/net/mptcp/options.c
> @@ -24,8 +24,6 @@ static void mptcp_parse_option(const struct sk_buff *skb,
> 			       const unsigned char *ptr, int opsize,
> 			       struct mptcp_options_received *mp_opt)
> {
> -	struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
> -	struct mptcp_sock *msk = mptcp_sk(subflow->conn);
> 	u8 subtype = *ptr >> 4;
> 	int expected_opsize;
> 	u8 version;
> @@ -74,7 +72,6 @@ static void mptcp_parse_option(const struct sk_buff *skb,
> 		 * negotiated, the receiver MUST close the subflow with a RST as
> 		 * it is considered broken."
> 		 */
> -		mp_opt->csum_reqd = READ_ONCE(msk->csum_enabled);
> 		if (flags & MPTCP_CAP_CHECKSUM_REQD)
> 			mp_opt->csum_reqd = 1;
>
> @@ -329,6 +326,8 @@ void mptcp_get_options(const struct sock *sk,
> 		       const struct sk_buff *skb,
> 		       struct mptcp_options_received *mp_opt)
> {
> +	struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
> +	struct mptcp_sock *msk = mptcp_sk(subflow->conn);
> 	const struct tcphdr *th = tcp_hdr(skb);
> 	const unsigned char *ptr;
> 	int length;
> @@ -344,7 +343,7 @@ void mptcp_get_options(const struct sock *sk,
> 	mp_opt->dss = 0;
> 	mp_opt->mp_prio = 0;
> 	mp_opt->reset = 0;
> -	mp_opt->csum_reqd = 0;
> +	mp_opt->csum_reqd = READ_ONCE(msk->csum_enabled);
>
> 	length = (th->doff * 4) - sizeof(struct tcphdr);
> 	ptr = (const unsigned char *)(th + 1);
> -- 
> 2.31.1
>
>
>

--
Mat Martineau
Intel