diff options
author | 2020-02-27 18:31:39 -0800 | |
---|---|---|
committer | 2020-02-27 18:31:39 -0800 | |
commit | 9f6e055907362f6692185c1c9658295d24095c74 (patch) | |
tree | a7dc22fa7481300c92c0a33b54a32cb9ee551b5f /net/mptcp/protocol.c | |
parent | mlxsw: reg: Update module_type values in PMTM register and map them to width (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
download | wireguard-linux-9f6e055907362f6692185c1c9658295d24095c74.tar.xz wireguard-linux-9f6e055907362f6692185c1c9658295d24095c74.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The mptcp conflict was overlapping additions.
The SMC conflict was an additional and removal happening at the same
time.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mptcp/protocol.c')
-rw-r--r-- | net/mptcp/protocol.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 044295707bbf..a8445407d25a 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -666,6 +666,11 @@ static void __mptcp_close_ssk(struct sock *sk, struct sock *ssk, } } +static unsigned int mptcp_sync_mss(struct sock *sk, u32 pmtu) +{ + return 0; +} + static void mptcp_worker(struct work_struct *work) { struct mptcp_sock *msk = container_of(work, struct mptcp_sock, work); @@ -686,6 +691,7 @@ static int __mptcp_init_sock(struct sock *sk) INIT_WORK(&msk->work, mptcp_worker); msk->first = NULL; + inet_csk(sk)->icsk_sync_mss = mptcp_sync_mss; return 0; } |