From: Geliang Tang <geliangtang@gmail.com>
To: Mat Martineau <mathew.j.martineau@linux.intel.com>
Cc: mptcp@lists.linux.dev
Subject: Re: [MPTCP][PATCH mptcp-next] Squash to "mptcp: generate the data checksum"
Date: Tue, 11 May 2021 12:03:34 +0800 [thread overview]
Message-ID: <YJoCFsHJjFSPgE4G@MiBook> (raw)
In-Reply-To: <e3d8cbf6-4de3-40da-5442-49d5265f9f5@linux.intel.com>
Hi Mat,
On Mon, May 10, 2021 at 05:45:48PM -0700, Mat Martineau wrote:
> On Fri, 7 May 2021, Geliang Tang wrote:
>
> > Move the csum_replace2 trunk into the later patch "mptcp: receive
> > checksum for MP_CAPABLE with data".
> >
> > Signed-off-by: Geliang Tang <geliangtang@gmail.com>
> > ---
> > net/mptcp/options.c | 3 ---
> > 1 file changed, 3 deletions(-)
> >
> > diff --git a/net/mptcp/options.c b/net/mptcp/options.c
> > index beac01f58cba..99fc21406168 100644
> > --- a/net/mptcp/options.c
> > +++ b/net/mptcp/options.c
> > @@ -519,9 +519,6 @@ static void mptcp_write_data_fin(struct mptcp_subflow_context *subflow,
> > */
> > ext->data_fin = 1;
> > ext->data_len++;
> > -
> > - /* the pseudo header has changed, update the csum accordingly */
> > - csum_replace2(&ext->csum, htons(ext->data_len - 1), htons(ext->data_len));
>
> The commit message above says this is is moved to another patch, but the
> posted squash-to patch for "mptcp: receive checksum for MP_CAPABLE with
> data" doesn't add this functionality back. Is a hunk or another squash-to
> patch missing?
Sorry, I didn't describe it clearly.
No squash-to patch is missing here, this truck will be moved to another
patch automatically when resolving the conflict.
Apply this squash-to patch (Squash to "mptcp: generate the data checksum")
and rebase, we will get a conflict with "mptcp: receive checksum for
MP_CAPABLE with data":
$ git rebase --continue
Auto-merging net/mptcp/protocol.h
Auto-merging net/mptcp/options.c
CONFLICT (content): Merge conflict in net/mptcp/options.c
error: could not apply d56805c0f705... mptcp: receive checksum for MP_CAPABLE with data
Resolve this conflict like this:
'''
<<<<<<< HEAD
=======
/* the pseudo header has changed, update the csum accordingly */
if (ext->csum_reqd)
csum_replace2(&ext->csum, htons(ext->data_len - 1),
htons(ext->data_len));
>>>>>>> d56805c0f705... mptcp: receive checksum for MP_CAPABLE with data
}
}
'''
->
'''
/* the pseudo header has changed, update the csum accordingly */
if (ext->csum_reqd)
csum_replace2(&ext->csum, htons(ext->data_len - 1),
htons(ext->data_len));
}
}
'''
Then the csum_replace2 trunk have been moved to the patch "mptcp: receive
checksum for MP_CAPABLE with data" automatically.
Thanks.
-Geliang
>
>
> Thanks,
>
> --
> Mat Martineau
> Intel
next prev parent reply other threads:[~2021-05-11 4:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-07 4:18 [MPTCP][PATCH mptcp-next] Squash to "mptcp: generate the data checksum" Geliang Tang
2021-05-11 0:45 ` Mat Martineau
2021-05-11 4:03 ` Geliang Tang [this message]
2021-05-11 23:17 ` Mat Martineau
2021-05-12 4:18 ` Geliang Tang
2021-05-13 7:42 ` Matthieu Baerts
-- strict thread matches above, loose matches on Subject: below --
2021-05-18 7:06 Geliang Tang
2021-05-20 21:56 ` Mat Martineau
2021-06-03 14:59 ` Matthieu Baerts
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YJoCFsHJjFSPgE4G@MiBook \
--to=geliangtang@gmail.com \
--cc=mathew.j.martineau@linux.intel.com \
--cc=mptcp@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.