From 36b07622fb65af4ec6842dbba8a98dbb98e67462 Mon Sep 17 00:00:00 2001 From: Ycarus Date: Tue, 31 Jul 2018 23:12:12 +0200 Subject: [PATCH] Update MPTCP 0.94 --- .../generic/hack-4.14/690-mptcp_v0.94.patch | 130 ++++++++++-------- 1 file changed, 69 insertions(+), 61 deletions(-) diff --git a/root/target/linux/generic/hack-4.14/690-mptcp_v0.94.patch b/root/target/linux/generic/hack-4.14/690-mptcp_v0.94.patch index e792ceac..fb7fad7d 100644 --- a/root/target/linux/generic/hack-4.14/690-mptcp_v0.94.patch +++ b/root/target/linux/generic/hack-4.14/690-mptcp_v0.94.patch @@ -1,6 +1,6 @@ diff -aurN linux-4.14.41/Documentation/networking/ip-sysctl.txt mptcp-mptcp_v0.94/Documentation/networking/ip-sysctl.txt --- linux-4.14.41/Documentation/networking/ip-sysctl.txt 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/Documentation/networking/ip-sysctl.txt 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/Documentation/networking/ip-sysctl.txt 2018-07-20 10:46:09.000000000 +0200 @@ -728,6 +728,18 @@ in RFC 5961 (Improving TCP's Robustness to Blind In-Window Attacks) Default: 100 @@ -22,7 +22,7 @@ diff -aurN linux-4.14.41/Documentation/networking/ip-sysctl.txt mptcp-mptcp_v0.9 udp_l3mdev_accept - BOOLEAN diff -aurN linux-4.14.41/drivers/infiniband/hw/cxgb4/cm.c mptcp-mptcp_v0.94/drivers/infiniband/hw/cxgb4/cm.c --- linux-4.14.41/drivers/infiniband/hw/cxgb4/cm.c 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/drivers/infiniband/hw/cxgb4/cm.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/drivers/infiniband/hw/cxgb4/cm.c 2018-07-20 10:46:09.000000000 +0200 @@ -3752,7 +3752,7 @@ */ memset(&tmp_opt, 0, sizeof(tmp_opt)); @@ -34,7 +34,7 @@ diff -aurN linux-4.14.41/drivers/infiniband/hw/cxgb4/cm.c mptcp-mptcp_v0.94/driv memset(req, 0, sizeof(*req)); diff -aurN linux-4.14.41/include/linux/skbuff.h mptcp-mptcp_v0.94/include/linux/skbuff.h --- linux-4.14.41/include/linux/skbuff.h 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/include/linux/skbuff.h 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/include/linux/skbuff.h 2018-07-20 10:46:09.000000000 +0200 @@ -684,7 +684,7 @@ * want to keep them across layers you have to do a skb_clone() * first. This is owned by whoever has the skb queued ATM. @@ -46,7 +46,7 @@ diff -aurN linux-4.14.41/include/linux/skbuff.h mptcp-mptcp_v0.94/include/linux/ void (*destructor)(struct sk_buff *skb); diff -aurN linux-4.14.41/include/linux/tcp.h mptcp-mptcp_v0.94/include/linux/tcp.h --- linux-4.14.41/include/linux/tcp.h 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/include/linux/tcp.h 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/include/linux/tcp.h 2018-07-20 10:46:09.000000000 +0200 @@ -58,7 +58,7 @@ /* TCP Fast Open */ #define TCP_FASTOPEN_COOKIE_MIN 4 /* Min Fast Open Cookie size in bytes */ @@ -205,7 +205,7 @@ diff -aurN linux-4.14.41/include/linux/tcp.h mptcp-mptcp_v0.94/include/linux/tcp static inline struct tcp_timewait_sock *tcp_twsk(const struct sock *sk) diff -aurN linux-4.14.41/include/net/inet_common.h mptcp-mptcp_v0.94/include/net/inet_common.h --- linux-4.14.41/include/net/inet_common.h 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/include/net/inet_common.h 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/include/net/inet_common.h 2018-07-20 10:46:09.000000000 +0200 @@ -2,6 +2,8 @@ #ifndef _INET_COMMON_H #define _INET_COMMON_H @@ -226,7 +226,7 @@ diff -aurN linux-4.14.41/include/net/inet_common.h mptcp-mptcp_v0.94/include/net int addr_len, int flags); diff -aurN linux-4.14.41/include/net/inet_connection_sock.h mptcp-mptcp_v0.94/include/net/inet_connection_sock.h --- linux-4.14.41/include/net/inet_connection_sock.h 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/include/net/inet_connection_sock.h 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/include/net/inet_connection_sock.h 2018-07-20 10:46:09.000000000 +0200 @@ -30,6 +30,7 @@ struct inet_bind_bucket; @@ -237,7 +237,7 @@ diff -aurN linux-4.14.41/include/net/inet_connection_sock.h mptcp-mptcp_v0.94/in * Pointers to address related TCP functions diff -aurN linux-4.14.41/include/net/inet_sock.h mptcp-mptcp_v0.94/include/net/inet_sock.h --- linux-4.14.41/include/net/inet_sock.h 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/include/net/inet_sock.h 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/include/net/inet_sock.h 2018-07-20 10:46:09.000000000 +0200 @@ -90,7 +90,9 @@ wscale_ok : 1, ecn_ok : 1, @@ -251,7 +251,7 @@ diff -aurN linux-4.14.41/include/net/inet_sock.h mptcp-mptcp_v0.94/include/net/i struct ip_options_rcu __rcu *ireq_opt; diff -aurN linux-4.14.41/include/net/mptcp.h mptcp-mptcp_v0.94/include/net/mptcp.h --- linux-4.14.41/include/net/mptcp.h 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.94/include/net/mptcp.h 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/include/net/mptcp.h 2018-07-20 10:46:09.000000000 +0200 @@ -0,0 +1,1508 @@ +/* + * MPTCP implementation @@ -1763,7 +1763,7 @@ diff -aurN linux-4.14.41/include/net/mptcp.h mptcp-mptcp_v0.94/include/net/mptcp +#endif /* _MPTCP_H */ diff -aurN linux-4.14.41/include/net/mptcp_v4.h mptcp-mptcp_v0.94/include/net/mptcp_v4.h --- linux-4.14.41/include/net/mptcp_v4.h 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.94/include/net/mptcp_v4.h 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/include/net/mptcp_v4.h 2018-07-20 10:46:09.000000000 +0200 @@ -0,0 +1,68 @@ +/* + * MPTCP implementation @@ -1835,7 +1835,7 @@ diff -aurN linux-4.14.41/include/net/mptcp_v4.h mptcp-mptcp_v0.94/include/net/mp +#endif /* MPTCP_V4_H_ */ diff -aurN linux-4.14.41/include/net/mptcp_v6.h mptcp-mptcp_v0.94/include/net/mptcp_v6.h --- linux-4.14.41/include/net/mptcp_v6.h 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.94/include/net/mptcp_v6.h 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/include/net/mptcp_v6.h 2018-07-20 10:46:09.000000000 +0200 @@ -0,0 +1,69 @@ +/* + * MPTCP implementation @@ -1908,7 +1908,7 @@ diff -aurN linux-4.14.41/include/net/mptcp_v6.h mptcp-mptcp_v0.94/include/net/mp +#endif /* _MPTCP_V6_H */ diff -aurN linux-4.14.41/include/net/net_namespace.h mptcp-mptcp_v0.94/include/net/net_namespace.h --- linux-4.14.41/include/net/net_namespace.h 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/include/net/net_namespace.h 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/include/net/net_namespace.h 2018-07-20 10:46:09.000000000 +0200 @@ -18,6 +18,7 @@ #include #include @@ -1929,7 +1929,7 @@ diff -aurN linux-4.14.41/include/net/net_namespace.h mptcp-mptcp_v0.94/include/n #endif diff -aurN linux-4.14.41/include/net/netns/mptcp.h mptcp-mptcp_v0.94/include/net/netns/mptcp.h --- linux-4.14.41/include/net/netns/mptcp.h 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.94/include/net/netns/mptcp.h 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/include/net/netns/mptcp.h 2018-07-20 10:46:09.000000000 +0200 @@ -0,0 +1,52 @@ +/* + * MPTCP implementation - MPTCP namespace @@ -1985,7 +1985,7 @@ diff -aurN linux-4.14.41/include/net/netns/mptcp.h mptcp-mptcp_v0.94/include/net +#endif /* __NETNS_MPTCP_H__ */ diff -aurN linux-4.14.41/include/net/snmp.h mptcp-mptcp_v0.94/include/net/snmp.h --- linux-4.14.41/include/net/snmp.h 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/include/net/snmp.h 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/include/net/snmp.h 2018-07-20 10:46:09.000000000 +0200 @@ -91,7 +91,6 @@ atomic_long_t mibs[ICMP6MSG_MIB_MAX]; }; @@ -1996,7 +1996,7 @@ diff -aurN linux-4.14.41/include/net/snmp.h mptcp-mptcp_v0.94/include/net/snmp.h struct tcp_mib { diff -aurN linux-4.14.41/include/net/sock.h mptcp-mptcp_v0.94/include/net/sock.h --- linux-4.14.41/include/net/sock.h 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/include/net/sock.h 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/include/net/sock.h 2018-07-20 10:46:09.000000000 +0200 @@ -771,6 +771,7 @@ SOCK_FILTER_LOCKED, /* Filter cannot be changed anymore */ SOCK_SELECT_ERR_QUEUE, /* Wake select on error queue */ @@ -2015,7 +2015,7 @@ diff -aurN linux-4.14.41/include/net/sock.h mptcp-mptcp_v0.94/include/net/sock.h #ifdef CONFIG_PROC_FS diff -aurN linux-4.14.41/include/net/tcp.h mptcp-mptcp_v0.94/include/net/tcp.h --- linux-4.14.41/include/net/tcp.h 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/include/net/tcp.h 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/include/net/tcp.h 2018-07-20 10:46:09.000000000 +0200 @@ -185,6 +185,7 @@ #define TCPOPT_SACK 5 /* SACK Block */ #define TCPOPT_TIMESTAMP 8 /* Better RTT estimations/PAWS */ @@ -2339,7 +2339,7 @@ diff -aurN linux-4.14.41/include/net/tcp.h mptcp-mptcp_v0.94/include/net/tcp.h { diff -aurN linux-4.14.41/include/net/tcp_states.h mptcp-mptcp_v0.94/include/net/tcp_states.h --- linux-4.14.41/include/net/tcp_states.h 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/include/net/tcp_states.h 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/include/net/tcp_states.h 2018-07-20 10:46:09.000000000 +0200 @@ -26,6 +26,7 @@ TCP_LISTEN, TCP_CLOSING, /* Now a valid state */ @@ -2358,7 +2358,7 @@ diff -aurN linux-4.14.41/include/net/tcp_states.h mptcp-mptcp_v0.94/include/net/ #endif /* _LINUX_TCP_STATES_H */ diff -aurN linux-4.14.41/include/net/transp_v6.h mptcp-mptcp_v0.94/include/net/transp_v6.h --- linux-4.14.41/include/net/transp_v6.h 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/include/net/transp_v6.h 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/include/net/transp_v6.h 2018-07-20 10:46:09.000000000 +0200 @@ -52,6 +52,8 @@ /* address family specific functions */ @@ -2370,7 +2370,7 @@ diff -aurN linux-4.14.41/include/net/transp_v6.h mptcp-mptcp_v0.94/include/net/t diff -aurN linux-4.14.41/include/uapi/linux/if.h mptcp-mptcp_v0.94/include/uapi/linux/if.h --- linux-4.14.41/include/uapi/linux/if.h 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/include/uapi/linux/if.h 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/include/uapi/linux/if.h 2018-07-20 10:46:09.000000000 +0200 @@ -132,6 +132,9 @@ #define IFF_ECHO IFF_ECHO #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ @@ -2383,7 +2383,7 @@ diff -aurN linux-4.14.41/include/uapi/linux/if.h mptcp-mptcp_v0.94/include/uapi/ diff -aurN linux-4.14.41/include/uapi/linux/tcp.h mptcp-mptcp_v0.94/include/uapi/linux/tcp.h --- linux-4.14.41/include/uapi/linux/tcp.h 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/include/uapi/linux/tcp.h 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/include/uapi/linux/tcp.h 2018-07-20 10:46:09.000000000 +0200 @@ -18,9 +18,15 @@ #ifndef _UAPI_LINUX_TCP_H #define _UAPI_LINUX_TCP_H @@ -2470,7 +2470,7 @@ diff -aurN linux-4.14.41/include/uapi/linux/tcp.h mptcp-mptcp_v0.94/include/uapi diff -aurN linux-4.14.41/net/core/dev.c mptcp-mptcp_v0.94/net/core/dev.c --- linux-4.14.41/net/core/dev.c 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/net/core/dev.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/core/dev.c 2018-07-20 10:46:09.000000000 +0200 @@ -6740,7 +6740,7 @@ dev->flags = (flags & (IFF_DEBUG | IFF_NOTRAILERS | IFF_NOARP | @@ -2482,7 +2482,7 @@ diff -aurN linux-4.14.41/net/core/dev.c mptcp-mptcp_v0.94/net/core/dev.c diff -aurN linux-4.14.41/net/core/skbuff.c mptcp-mptcp_v0.94/net/core/skbuff.c --- linux-4.14.41/net/core/skbuff.c 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/net/core/skbuff.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/core/skbuff.c 2018-07-20 10:46:09.000000000 +0200 @@ -532,7 +532,7 @@ skb_drop_list(&skb_shinfo(skb)->frag_list); } @@ -2503,7 +2503,7 @@ diff -aurN linux-4.14.41/net/core/skbuff.c mptcp-mptcp_v0.94/net/core/skbuff.c diff -aurN linux-4.14.41/net/core/sock.c mptcp-mptcp_v0.94/net/core/sock.c --- linux-4.14.41/net/core/sock.c 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/net/core/sock.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/core/sock.c 2018-07-20 10:46:09.000000000 +0200 @@ -139,6 +139,11 @@ #include @@ -2565,7 +2565,7 @@ diff -aurN linux-4.14.41/net/core/sock.c mptcp-mptcp_v0.94/net/core/sock.c diff -aurN linux-4.14.41/net/ipv4/af_inet.c mptcp-mptcp_v0.94/net/ipv4/af_inet.c --- linux-4.14.41/net/ipv4/af_inet.c 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/net/ipv4/af_inet.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/ipv4/af_inet.c 2018-07-20 10:46:09.000000000 +0200 @@ -104,6 +104,7 @@ #include #include @@ -2630,7 +2630,7 @@ diff -aurN linux-4.14.41/net/ipv4/af_inet.c mptcp-mptcp_v0.94/net/ipv4/af_inet.c diff -aurN linux-4.14.41/net/ipv4/inet_connection_sock.c mptcp-mptcp_v0.94/net/ipv4/inet_connection_sock.c --- linux-4.14.41/net/ipv4/inet_connection_sock.c 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/net/ipv4/inet_connection_sock.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/ipv4/inet_connection_sock.c 2018-07-20 10:46:09.000000000 +0200 @@ -23,6 +23,7 @@ #include #include @@ -2686,7 +2686,7 @@ diff -aurN linux-4.14.41/net/ipv4/inet_connection_sock.c mptcp-mptcp_v0.94/net/i cond_resched(); diff -aurN linux-4.14.41/net/ipv4/ip_sockglue.c mptcp-mptcp_v0.94/net/ipv4/ip_sockglue.c --- linux-4.14.41/net/ipv4/ip_sockglue.c 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/net/ipv4/ip_sockglue.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/ipv4/ip_sockglue.c 2018-07-20 10:46:09.000000000 +0200 @@ -44,6 +44,8 @@ #endif #include @@ -2716,7 +2716,7 @@ diff -aurN linux-4.14.41/net/ipv4/ip_sockglue.c mptcp-mptcp_v0.94/net/ipv4/ip_so case IP_TTL: diff -aurN linux-4.14.41/net/ipv4/Kconfig mptcp-mptcp_v0.94/net/ipv4/Kconfig --- linux-4.14.41/net/ipv4/Kconfig 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/net/ipv4/Kconfig 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/ipv4/Kconfig 2018-07-20 10:46:09.000000000 +0200 @@ -675,6 +675,38 @@ bufferbloat, policers, or AQM schemes that do not provide a delay signal. It requires the fq ("Fair Queue") pacing packet scheduler. @@ -2788,7 +2788,7 @@ diff -aurN linux-4.14.41/net/ipv4/Kconfig mptcp-mptcp_v0.94/net/ipv4/Kconfig default "cdg" if DEFAULT_CDG diff -aurN linux-4.14.41/net/ipv4/syncookies.c mptcp-mptcp_v0.94/net/ipv4/syncookies.c --- linux-4.14.41/net/ipv4/syncookies.c 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/net/ipv4/syncookies.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/ipv4/syncookies.c 2018-07-20 10:46:09.000000000 +0200 @@ -16,6 +16,8 @@ #include #include @@ -2903,7 +2903,7 @@ diff -aurN linux-4.14.41/net/ipv4/syncookies.c mptcp-mptcp_v0.94/net/ipv4/syncoo ireq->ecn_ok = cookie_ecn_ok(&tcp_opt, sock_net(sk), &rt->dst); diff -aurN linux-4.14.41/net/ipv4/tcp.c mptcp-mptcp_v0.94/net/ipv4/tcp.c --- linux-4.14.41/net/ipv4/tcp.c 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/net/ipv4/tcp.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/ipv4/tcp.c 2018-07-20 10:46:09.000000000 +0200 @@ -273,6 +273,7 @@ #include @@ -3520,7 +3520,7 @@ diff -aurN linux-4.14.41/net/ipv4/tcp.c mptcp-mptcp_v0.94/net/ipv4/tcp.c EXPORT_SYMBOL_GPL(tcp_abort); diff -aurN linux-4.14.41/net/ipv4/tcp_fastopen.c mptcp-mptcp_v0.94/net/ipv4/tcp_fastopen.c --- linux-4.14.41/net/ipv4/tcp_fastopen.c 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/net/ipv4/tcp_fastopen.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/ipv4/tcp_fastopen.c 2018-07-20 10:46:09.000000000 +0200 @@ -9,6 +9,7 @@ #include #include @@ -3575,7 +3575,7 @@ diff -aurN linux-4.14.41/net/ipv4/tcp_fastopen.c mptcp-mptcp_v0.94/net/ipv4/tcp_ */ diff -aurN linux-4.14.41/net/ipv4/tcp_input.c mptcp-mptcp_v0.94/net/ipv4/tcp_input.c --- linux-4.14.41/net/ipv4/tcp_input.c 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/net/ipv4/tcp_input.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/ipv4/tcp_input.c 2018-07-20 10:46:09.000000000 +0200 @@ -76,6 +76,9 @@ #include #include @@ -4434,7 +4434,7 @@ diff -aurN linux-4.14.41/net/ipv4/tcp_input.c mptcp-mptcp_v0.94/net/ipv4/tcp_inp tcp_rsk(req)->tfo_listener = false; diff -aurN linux-4.14.41/net/ipv4/tcp_ipv4.c mptcp-mptcp_v0.94/net/ipv4/tcp_ipv4.c --- linux-4.14.41/net/ipv4/tcp_ipv4.c 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/net/ipv4/tcp_ipv4.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/ipv4/tcp_ipv4.c 2018-07-20 10:46:09.000000000 +0200 @@ -67,6 +67,8 @@ #include #include @@ -4930,7 +4930,7 @@ diff -aurN linux-4.14.41/net/ipv4/tcp_ipv4.c mptcp-mptcp_v0.94/net/ipv4/tcp_ipv4 diff -aurN linux-4.14.41/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.94/net/ipv4/tcp_minisocks.c --- linux-4.14.41/net/ipv4/tcp_minisocks.c 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/net/ipv4/tcp_minisocks.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/ipv4/tcp_minisocks.c 2018-07-20 10:46:09.000000000 +0200 @@ -18,11 +18,13 @@ * Jorge Cwik, */ @@ -5143,7 +5143,7 @@ diff -aurN linux-4.14.41/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.94/net/ipv4/tcp } diff -aurN linux-4.14.41/net/ipv4/tcp_output.c mptcp-mptcp_v0.94/net/ipv4/tcp_output.c --- linux-4.14.41/net/ipv4/tcp_output.c 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/net/ipv4/tcp_output.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/ipv4/tcp_output.c 2018-07-20 10:46:09.000000000 +0200 @@ -36,6 +36,12 @@ #define pr_fmt(fmt) "TCP: " fmt @@ -5738,7 +5738,7 @@ diff -aurN linux-4.14.41/net/ipv4/tcp_output.c mptcp-mptcp_v0.94/net/ipv4/tcp_ou /* Cancel probe timer, if it is not required. */ diff -aurN linux-4.14.41/net/ipv4/tcp_timer.c mptcp-mptcp_v0.94/net/ipv4/tcp_timer.c --- linux-4.14.41/net/ipv4/tcp_timer.c 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/net/ipv4/tcp_timer.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/ipv4/tcp_timer.c 2018-07-20 10:46:09.000000000 +0200 @@ -20,6 +20,7 @@ #include @@ -5938,7 +5938,7 @@ diff -aurN linux-4.14.41/net/ipv4/tcp_timer.c mptcp-mptcp_v0.94/net/ipv4/tcp_tim diff -aurN linux-4.14.41/net/ipv6/addrconf.c mptcp-mptcp_v0.94/net/ipv6/addrconf.c --- linux-4.14.41/net/ipv6/addrconf.c 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/net/ipv6/addrconf.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/ipv6/addrconf.c 2018-07-20 10:46:09.000000000 +0200 @@ -928,6 +928,7 @@ kfree_rcu(ifp, rcu); @@ -5949,7 +5949,7 @@ diff -aurN linux-4.14.41/net/ipv6/addrconf.c mptcp-mptcp_v0.94/net/ipv6/addrconf ipv6_link_dev_addr(struct inet6_dev *idev, struct inet6_ifaddr *ifp) diff -aurN linux-4.14.41/net/ipv6/af_inet6.c mptcp-mptcp_v0.94/net/ipv6/af_inet6.c --- linux-4.14.41/net/ipv6/af_inet6.c 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/net/ipv6/af_inet6.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/ipv6/af_inet6.c 2018-07-20 10:46:09.000000000 +0200 @@ -107,8 +107,7 @@ return (struct ipv6_pinfo *)(((u8 *)sk) + offset); } @@ -5962,7 +5962,7 @@ diff -aurN linux-4.14.41/net/ipv6/af_inet6.c mptcp-mptcp_v0.94/net/ipv6/af_inet6 struct ipv6_pinfo *np; diff -aurN linux-4.14.41/net/ipv6/ipv6_sockglue.c mptcp-mptcp_v0.94/net/ipv6/ipv6_sockglue.c --- linux-4.14.41/net/ipv6/ipv6_sockglue.c 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/net/ipv6/ipv6_sockglue.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/ipv6/ipv6_sockglue.c 2018-07-20 10:46:09.000000000 +0200 @@ -48,6 +48,8 @@ #include #include @@ -5988,7 +5988,7 @@ diff -aurN linux-4.14.41/net/ipv6/ipv6_sockglue.c mptcp-mptcp_v0.94/net/ipv6/ipv tcp_sync_mss(sk, icsk->icsk_pmtu_cookie); diff -aurN linux-4.14.41/net/ipv6/syncookies.c mptcp-mptcp_v0.94/net/ipv6/syncookies.c --- linux-4.14.41/net/ipv6/syncookies.c 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/net/ipv6/syncookies.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/ipv6/syncookies.c 2018-07-20 10:46:09.000000000 +0200 @@ -20,6 +20,8 @@ #include #include @@ -6072,7 +6072,7 @@ diff -aurN linux-4.14.41/net/ipv6/syncookies.c mptcp-mptcp_v0.94/net/ipv6/syncoo ireq->ecn_ok = cookie_ecn_ok(&tcp_opt, sock_net(sk), dst); diff -aurN linux-4.14.41/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.94/net/ipv6/tcp_ipv6.c --- linux-4.14.41/net/ipv6/tcp_ipv6.c 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/net/ipv6/tcp_ipv6.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/ipv6/tcp_ipv6.c 2018-07-20 10:46:09.000000000 +0200 @@ -61,6 +61,8 @@ #include #include @@ -6696,7 +6696,7 @@ diff -aurN linux-4.14.41/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.94/net/ipv6/tcp_ipv6 /* thinking of making this const? Don't. diff -aurN linux-4.14.41/net/Kconfig mptcp-mptcp_v0.94/net/Kconfig --- linux-4.14.41/net/Kconfig 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/net/Kconfig 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/Kconfig 2018-07-20 10:46:09.000000000 +0200 @@ -88,6 +88,7 @@ source "net/ipv4/Kconfig" source "net/ipv6/Kconfig" @@ -6707,7 +6707,7 @@ diff -aurN linux-4.14.41/net/Kconfig mptcp-mptcp_v0.94/net/Kconfig diff -aurN linux-4.14.41/net/Makefile mptcp-mptcp_v0.94/net/Makefile --- linux-4.14.41/net/Makefile 2018-05-16 10:10:32.000000000 +0200 -+++ mptcp-mptcp_v0.94/net/Makefile 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/Makefile 2018-07-20 10:46:09.000000000 +0200 @@ -20,6 +20,7 @@ obj-$(CONFIG_XFRM) += xfrm/ obj-$(CONFIG_UNIX) += unix/ @@ -6718,7 +6718,7 @@ diff -aurN linux-4.14.41/net/Makefile mptcp-mptcp_v0.94/net/Makefile obj-$(CONFIG_BRIDGE) += bridge/ diff -aurN linux-4.14.41/net/mptcp/Kconfig mptcp-mptcp_v0.94/net/mptcp/Kconfig --- linux-4.14.41/net/mptcp/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.94/net/mptcp/Kconfig 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/mptcp/Kconfig 2018-07-20 10:46:09.000000000 +0200 @@ -0,0 +1,129 @@ +# +# MPTCP configuration @@ -6851,7 +6851,7 @@ diff -aurN linux-4.14.41/net/mptcp/Kconfig mptcp-mptcp_v0.94/net/mptcp/Kconfig + diff -aurN linux-4.14.41/net/mptcp/Makefile mptcp-mptcp_v0.94/net/mptcp/Makefile --- linux-4.14.41/net/mptcp/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.94/net/mptcp/Makefile 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/mptcp/Makefile 2018-07-20 10:46:09.000000000 +0200 @@ -0,0 +1,22 @@ +# +## Makefile for MultiPath TCP support code. @@ -6877,7 +6877,7 @@ diff -aurN linux-4.14.41/net/mptcp/Makefile mptcp-mptcp_v0.94/net/mptcp/Makefile + diff -aurN linux-4.14.41/net/mptcp/mptcp_balia.c mptcp-mptcp_v0.94/net/mptcp/mptcp_balia.c --- linux-4.14.41/net/mptcp/mptcp_balia.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_balia.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_balia.c 2018-07-20 10:46:09.000000000 +0200 @@ -0,0 +1,268 @@ +/* + * MPTCP implementation - Balia Congestion Control @@ -7149,7 +7149,7 @@ diff -aurN linux-4.14.41/net/mptcp/mptcp_balia.c mptcp-mptcp_v0.94/net/mptcp/mpt +MODULE_VERSION("0.1"); diff -aurN linux-4.14.41/net/mptcp/mptcp_binder.c mptcp-mptcp_v0.94/net/mptcp/mptcp_binder.c --- linux-4.14.41/net/mptcp/mptcp_binder.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_binder.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_binder.c 2018-07-20 10:46:09.000000000 +0200 @@ -0,0 +1,486 @@ +#include + @@ -7639,7 +7639,7 @@ diff -aurN linux-4.14.41/net/mptcp/mptcp_binder.c mptcp-mptcp_v0.94/net/mptcp/mp +MODULE_VERSION("0.1"); diff -aurN linux-4.14.41/net/mptcp/mptcp_coupled.c mptcp-mptcp_v0.94/net/mptcp/mptcp_coupled.c --- linux-4.14.41/net/mptcp/mptcp_coupled.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_coupled.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_coupled.c 2018-07-20 10:46:09.000000000 +0200 @@ -0,0 +1,271 @@ +/* + * MPTCP implementation - Linked Increase congestion control Algorithm (LIA) @@ -7914,8 +7914,8 @@ diff -aurN linux-4.14.41/net/mptcp/mptcp_coupled.c mptcp-mptcp_v0.94/net/mptcp/m +MODULE_VERSION("0.1"); diff -aurN linux-4.14.41/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.94/net/mptcp/mptcp_ctrl.c --- linux-4.14.41/net/mptcp/mptcp_ctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ctrl.c 2018-07-16 20:53:41.000000000 +0200 -@@ -0,0 +1,2906 @@ ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ctrl.c 2018-07-20 10:46:09.000000000 +0200 +@@ -0,0 +1,2914 @@ +/* + * MPTCP implementation - MPTCP-control + * @@ -8215,6 +8215,7 @@ diff -aurN linux-4.14.41/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.94/net/mptcp/mptc + const struct tcp_sock *tp = tcp_sk(sk); + + inet_rsk(req)->saw_mpc = 1; ++ + /* MPTCP version agreement */ + if (mopt->mptcp_ver >= tp->mptcp_ver) + mtreq->mptcp_ver = tp->mptcp_ver; @@ -8234,11 +8235,18 @@ diff -aurN linux-4.14.41/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.94/net/mptcp/mptc +} + +static int mptcp_reqsk_new_cookie(struct request_sock *req, ++ const struct sock *sk, + const struct mptcp_options_received *mopt, + const struct sk_buff *skb) +{ + struct mptcp_request_sock *mtreq = mptcp_rsk(req); + ++ /* MPTCP version agreement */ ++ if (mopt->mptcp_ver >= tcp_sk(sk)->mptcp_ver) ++ mtreq->mptcp_ver = tcp_sk(sk)->mptcp_ver; ++ else ++ mtreq->mptcp_ver = mopt->mptcp_ver; ++ + rcu_read_lock_bh(); + spin_lock(&mptcp_tk_hashlock); + @@ -10256,7 +10264,7 @@ diff -aurN linux-4.14.41/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.94/net/mptcp/mptc + mtreq->dss_csum = mopt.dss_csum; + + if (want_cookie) { -+ if (!mptcp_reqsk_new_cookie(req, &mopt, skb)) ++ if (!mptcp_reqsk_new_cookie(req, sk, &mopt, skb)) + /* No key available - back to regular TCP */ + inet_rsk(req)->mptcp_rqsk = 0; + return; @@ -10824,7 +10832,7 @@ diff -aurN linux-4.14.41/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.94/net/mptcp/mptc +} diff -aurN linux-4.14.41/net/mptcp/mptcp_fullmesh.c mptcp-mptcp_v0.94/net/mptcp/mptcp_fullmesh.c --- linux-4.14.41/net/mptcp/mptcp_fullmesh.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_fullmesh.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_fullmesh.c 2018-07-20 10:46:09.000000000 +0200 @@ -0,0 +1,2013 @@ +#include +#include @@ -12841,7 +12849,7 @@ diff -aurN linux-4.14.41/net/mptcp/mptcp_fullmesh.c mptcp-mptcp_v0.94/net/mptcp/ +MODULE_VERSION("0.88"); diff -aurN linux-4.14.41/net/mptcp/mptcp_input.c mptcp-mptcp_v0.94/net/mptcp/mptcp_input.c --- linux-4.14.41/net/mptcp/mptcp_input.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_input.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_input.c 2018-07-20 10:46:09.000000000 +0200 @@ -0,0 +1,2467 @@ +/* + * MPTCP implementation - Sending side @@ -15312,7 +15320,7 @@ diff -aurN linux-4.14.41/net/mptcp/mptcp_input.c mptcp-mptcp_v0.94/net/mptcp/mpt +} diff -aurN linux-4.14.41/net/mptcp/mptcp_ipv4.c mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv4.c --- linux-4.14.41/net/mptcp/mptcp_ipv4.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv4.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv4.c 2018-07-20 10:46:09.000000000 +0200 @@ -0,0 +1,437 @@ +/* + * MPTCP implementation - IPv4-specific functions @@ -15753,7 +15761,7 @@ diff -aurN linux-4.14.41/net/mptcp/mptcp_ipv4.c mptcp-mptcp_v0.94/net/mptcp/mptc +} diff -aurN linux-4.14.41/net/mptcp/mptcp_ipv6.c mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv6.c --- linux-4.14.41/net/mptcp/mptcp_ipv6.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv6.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv6.c 2018-07-20 10:46:09.000000000 +0200 @@ -0,0 +1,465 @@ +/* + * MPTCP implementation - IPv6-specific functions @@ -16222,7 +16230,7 @@ diff -aurN linux-4.14.41/net/mptcp/mptcp_ipv6.c mptcp-mptcp_v0.94/net/mptcp/mptc +} diff -aurN linux-4.14.41/net/mptcp/mptcp_ndiffports.c mptcp-mptcp_v0.94/net/mptcp/mptcp_ndiffports.c --- linux-4.14.41/net/mptcp/mptcp_ndiffports.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ndiffports.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ndiffports.c 2018-07-20 10:46:09.000000000 +0200 @@ -0,0 +1,169 @@ +#include + @@ -16395,7 +16403,7 @@ diff -aurN linux-4.14.41/net/mptcp/mptcp_ndiffports.c mptcp-mptcp_v0.94/net/mptc +MODULE_VERSION("0.88"); diff -aurN linux-4.14.41/net/mptcp/mptcp_olia.c mptcp-mptcp_v0.94/net/mptcp/mptcp_olia.c --- linux-4.14.41/net/mptcp/mptcp_olia.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_olia.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_olia.c 2018-07-20 10:46:09.000000000 +0200 @@ -0,0 +1,310 @@ +/* + * MPTCP implementation - OPPORTUNISTIC LINKED INCREASES CONGESTION CONTROL: @@ -16709,7 +16717,7 @@ diff -aurN linux-4.14.41/net/mptcp/mptcp_olia.c mptcp-mptcp_v0.94/net/mptcp/mptc +MODULE_VERSION("0.1"); diff -aurN linux-4.14.41/net/mptcp/mptcp_output.c mptcp-mptcp_v0.94/net/mptcp/mptcp_output.c --- linux-4.14.41/net/mptcp/mptcp_output.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_output.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_output.c 2018-07-20 10:46:09.000000000 +0200 @@ -0,0 +1,1813 @@ +/* + * MPTCP implementation - Sending side @@ -18526,7 +18534,7 @@ diff -aurN linux-4.14.41/net/mptcp/mptcp_output.c mptcp-mptcp_v0.94/net/mptcp/mp + diff -aurN linux-4.14.41/net/mptcp/mptcp_pm.c mptcp-mptcp_v0.94/net/mptcp/mptcp_pm.c --- linux-4.14.41/net/mptcp/mptcp_pm.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_pm.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_pm.c 2018-07-20 10:46:09.000000000 +0200 @@ -0,0 +1,226 @@ +/* + * MPTCP implementation - MPTCP-subflow-management @@ -18756,7 +18764,7 @@ diff -aurN linux-4.14.41/net/mptcp/mptcp_pm.c mptcp-mptcp_v0.94/net/mptcp/mptcp_ +late_initcall(mptcp_path_manager_default); diff -aurN linux-4.14.41/net/mptcp/mptcp_redundant.c mptcp-mptcp_v0.94/net/mptcp/mptcp_redundant.c --- linux-4.14.41/net/mptcp/mptcp_redundant.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_redundant.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_redundant.c 2018-07-20 10:46:09.000000000 +0200 @@ -0,0 +1,301 @@ +/* + * MPTCP Scheduler to reduce latency and jitter. @@ -19061,7 +19069,7 @@ diff -aurN linux-4.14.41/net/mptcp/mptcp_redundant.c mptcp-mptcp_v0.94/net/mptcp +MODULE_VERSION("0.90"); diff -aurN linux-4.14.41/net/mptcp/mptcp_rr.c mptcp-mptcp_v0.94/net/mptcp/mptcp_rr.c --- linux-4.14.41/net/mptcp/mptcp_rr.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_rr.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_rr.c 2018-07-20 10:46:09.000000000 +0200 @@ -0,0 +1,301 @@ +/* MPTCP Scheduler module selector. Highly inspired by tcp_cong.c */ + @@ -19366,7 +19374,7 @@ diff -aurN linux-4.14.41/net/mptcp/mptcp_rr.c mptcp-mptcp_v0.94/net/mptcp/mptcp_ +MODULE_VERSION("0.89"); diff -aurN linux-4.14.41/net/mptcp/mptcp_sched.c mptcp-mptcp_v0.94/net/mptcp/mptcp_sched.c --- linux-4.14.41/net/mptcp/mptcp_sched.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_sched.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_sched.c 2018-07-20 10:46:09.000000000 +0200 @@ -0,0 +1,627 @@ +/* MPTCP Scheduler module selector. Highly inspired by tcp_cong.c */ + @@ -19997,7 +20005,7 @@ diff -aurN linux-4.14.41/net/mptcp/mptcp_sched.c mptcp-mptcp_v0.94/net/mptcp/mpt +late_initcall(mptcp_scheduler_default); diff -aurN linux-4.14.41/net/mptcp/mptcp_wvegas.c mptcp-mptcp_v0.94/net/mptcp/mptcp_wvegas.c --- linux-4.14.41/net/mptcp/mptcp_wvegas.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_wvegas.c 2018-07-16 20:53:41.000000000 +0200 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_wvegas.c 2018-07-20 10:46:09.000000000 +0200 @@ -0,0 +1,270 @@ +/* + * MPTCP implementation - WEIGHTED VEGAS