diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-12-07 11:36:36 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-12-07 11:36:37 -0800 |
| commit | 59d58d93af94d7b546f12438b4a3d781b7190095 (patch) | |
| tree | 23cdba78ff4fc7a076e445b95a55db44cd213efc /include/linux | |
| parent | c0e5e11af12b76d0dbed700c1088c6827cdcf56c (diff) | |
| parent | 4f6e14bd19d6de7831f31cfb3210f2ea93eeb038 (diff) | |
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>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/tcp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 48d8a363319e..78b91bb92f0d 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -512,11 +512,13 @@ static inline u16 tcp_mss_clamp(const struct tcp_sock *tp, u16 mss) int tcp_skb_shift(struct sk_buff *to, struct sk_buff *from, int pcount, int shiftlen); +void __tcp_sock_set_cork(struct sock *sk, bool on); void tcp_sock_set_cork(struct sock *sk, bool on); int tcp_sock_set_keepcnt(struct sock *sk, int val); int tcp_sock_set_keepidle_locked(struct sock *sk, int val); int tcp_sock_set_keepidle(struct sock *sk, int val); int tcp_sock_set_keepintvl(struct sock *sk, int val); +void __tcp_sock_set_nodelay(struct sock *sk, bool on); void tcp_sock_set_nodelay(struct sock *sk); void tcp_sock_set_quickack(struct sock *sk, int val); int tcp_sock_set_syncnt(struct sock *sk, int val); |