Merge branch 'mptcp-new-features-for-mptcp-sockets-and-netlink-pm'
Mat Martineau says: ==================== mptcp: New features for MPTCP sockets and netlink PM This collection of patches adds MPTCP socket support for a few socket options, ioctls, and one ancillary data type (specifics for each are listed below). There's also a patch modifying the netlink MPTCP path manager API to allow setting the backup flag on a configured interface using the endpoint ID instead of the full IP address. Patches 1 & 2: TCP_INQ cmsg and selftests. Patches 2 & 3: SIOCINQ, OUTQ, and OUTQNSD ioctls and selftests. Patch 5: Change backup flag using endpoint ID. Patches 6 & 7: IP_TOS socket option and selftests. Patches 8-10: TCP_CORK and TCP_NODELAY socket options. Includes a tcp change to expose __tcp_sock_set_cork() and __tcp_sock_set_nodelay() for use by MPTCP. ==================== Link: https://lore.kernel.org/r/20211203223541.69364-1-mathew.j.martineau@linux.intel.com Signed-off-by:Jakub Kicinski <kuba@kernel.org>
Showing
- include/linux/tcp.h 2 additions, 0 deletionsinclude/linux/tcp.h
- net/ipv4/tcp.c 2 additions, 2 deletionsnet/ipv4/tcp.c
- net/mptcp/pm_netlink.c 10 additions, 4 deletionsnet/mptcp/pm_netlink.c
- net/mptcp/protocol.c 89 additions, 2 deletionsnet/mptcp/protocol.c
- net/mptcp/protocol.h 4 additions, 0 deletionsnet/mptcp/protocol.h
- net/mptcp/sockopt.c 131 additions, 1 deletionnet/mptcp/sockopt.c
- tools/testing/selftests/net/mptcp/.gitignore 1 addition, 0 deletionstools/testing/selftests/net/mptcp/.gitignore
- tools/testing/selftests/net/mptcp/Makefile 1 addition, 1 deletiontools/testing/selftests/net/mptcp/Makefile
- tools/testing/selftests/net/mptcp/mptcp_connect.c 59 additions, 1 deletiontools/testing/selftests/net/mptcp/mptcp_connect.c
- tools/testing/selftests/net/mptcp/mptcp_inq.c 603 additions, 0 deletionstools/testing/selftests/net/mptcp/mptcp_inq.c
- tools/testing/selftests/net/mptcp/mptcp_sockopt.c 63 additions, 0 deletionstools/testing/selftests/net/mptcp/mptcp_sockopt.c
- tools/testing/selftests/net/mptcp/mptcp_sockopt.sh 42 additions, 2 deletionstools/testing/selftests/net/mptcp/mptcp_sockopt.sh
Please register or sign in to comment