I've pushed a merge of mptcp_trunk and net-next to
intent (as discussed in the 05-April-2018 meeting) is to work toward an
upstreamable implementation by:
* Removing features and optimizations not strictly necessary for a
baseline MPTCP server
* Integrating architectural changes that are reviewed and accepted on
this mailing list
* Keeping up with net-next
While this repository is hosted on github, we will be conducting patch
review on this mailing list (and not using the github pull request
I'll be handling the net-next merges and pushing those directly to the
repository. In the future I will push proposed merges to a separate (TBD)
branch and notify the mailing list before updating master so people have
an opportunity to review the changes.
Specifics about this merge:
I did minimal conflict resolution in the merge commit itself, and made the
build fixes and code changes in a follow-up commit.
There was a significant TCP change where GSO (generic segmentation
offload) is now always enabled (see
This led to some new assumptions, like only supporting CHECKSUM_PARTIAL
skbs for TCP transmission.
Christoph, you might want to look at the checksum change in
mptcp_skb_entail(). I did some simple tests with and without the DSS
checksum enabled that seemed to work fine.
There may be opportunity to simplify mptcp_select_size() too, since the
TCP select_size() has been cut down to only a few lines. I kept the
current MPTCP behavior for now.