Re: [MPTCP][PATCH mptcp-next] Squash to "mptcp: generate the data checksum"

[Geliang Tang <geliangtang@gmail.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