From: David S. Miller Date: Fri, 16 Apr 2021 22:23:10 +0000 (-0700) Subject: Merge branch 'mptcp-socket-options' X-Git-Tag: v5.13-rc1~94^2~133 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c133acf38ca4ab498d0bfa25f3c218c263f6664a;p=thirdparty%2Flinux.git Merge branch 'mptcp-socket-options' Mat Martineau says: ==================== mptcp: Improve socket option handling MPTCP sockets have previously had limited socket option support. The architecture of MPTCP sockets (one userspace-facing MPTCP socket that manages one or more in-kernel TCP subflow sockets) adds complexity for passing options through to lower levels. This patch set adds MPTCP support for socket options commonly used with TCP. Patch 1 reverts an interim socket option fix (a socket option blocklist) that was merged in the net tree for v5.12. Patch 2 moves the socket option code to a separate file, with no functional changes. Patch 3 adds an allowlist for socket options that are known to function with MPTCP. Later patches in this set add more allowed options. Patches 4 and 5 add infrastructure for syncing MPTCP-level options with the TCP subflows. Patches 6-12 add support for specific socket options. Patch 13 adds a socket option self test. ==================== Signed-off-by: David S. Miller --- c133acf38ca4ab498d0bfa25f3c218c263f6664a