]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'mptcp-next'
authorDavid S. Miller <davem@davemloft.net>
Wed, 7 Apr 2021 21:09:40 +0000 (14:09 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 7 Apr 2021 21:09:40 +0000 (14:09 -0700)
Mat Martineau says:

====================
mptcp: Cleanup, a new test case, and header trimming

Some more patches to include from the MPTCP tree:

Patches 1-6 refactor an address-related data structure and reduce some
duplicate code that handles IPv4 and IPv6 addresses.

Patch 7 adds a test case for the MPTCP netlink interface, passing a
specific ifindex to the kernel.

Patch 8 drops extra header options from IPv4 address echo packets,
improving consistency and testability between IPv4 and IPv6.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge