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 dba93d56..193d2197 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 a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt ---- a/Documentation/networking/ip-sysctl.txt 2018-11-04 14:52:51.000000000 +0100 -+++ b/Documentation/networking/ip-sysctl.txt 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/Documentation/networking/ip-sysctl.txt mptcp-mptcp_v0.94/Documentation/networking/ip-sysctl.txt +--- linux-4.14.89/Documentation/networking/ip-sysctl.txt 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/Documentation/networking/ip-sysctl.txt 2018-12-20 12:51:01.000000000 +0100 @@ -725,6 +725,18 @@ in RFC 5961 (Improving TCP's Robustness to Blind In-Window Attacks) Default: 100 @@ -20,9 +20,9 @@ diff -aurN a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/i UDP variables: udp_l3mdev_accept - BOOLEAN -diff -aurN a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c ---- a/drivers/infiniband/hw/cxgb4/cm.c 2018-11-04 14:52:51.000000000 +0100 -+++ b/drivers/infiniband/hw/cxgb4/cm.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/drivers/infiniband/hw/cxgb4/cm.c mptcp-mptcp_v0.94/drivers/infiniband/hw/cxgb4/cm.c +--- linux-4.14.89/drivers/infiniband/hw/cxgb4/cm.c 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/drivers/infiniband/hw/cxgb4/cm.c 2018-12-20 12:51:01.000000000 +0100 @@ -3752,7 +3752,7 @@ */ memset(&tmp_opt, 0, sizeof(tmp_opt)); @@ -32,9 +32,9 @@ diff -aurN a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c req = __skb_push(skb, sizeof(*req)); memset(req, 0, sizeof(*req)); -diff -aurN a/include/linux/skbuff.h b/include/linux/skbuff.h ---- a/include/linux/skbuff.h 2018-11-04 14:52:51.000000000 +0100 -+++ b/include/linux/skbuff.h 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/include/linux/skbuff.h mptcp-mptcp_v0.94/include/linux/skbuff.h +--- linux-4.14.89/include/linux/skbuff.h 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/include/linux/skbuff.h 2018-12-20 12:51:01.000000000 +0100 @@ -690,7 +690,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. @@ -44,9 +44,9 @@ diff -aurN a/include/linux/skbuff.h b/include/linux/skbuff.h unsigned long _skb_refdst; void (*destructor)(struct sk_buff *skb); -diff -aurN a/include/linux/tcp.h b/include/linux/tcp.h ---- a/include/linux/tcp.h 2018-11-04 14:52:51.000000000 +0100 -+++ b/include/linux/tcp.h 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/include/linux/tcp.h mptcp-mptcp_v0.94/include/linux/tcp.h +--- linux-4.14.89/include/linux/tcp.h 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/include/linux/tcp.h 2018-12-20 12:51:01.000000000 +0100 @@ -58,7 +58,7 @@ /* TCP Fast Open */ #define TCP_FASTOPEN_COOKIE_MIN 4 /* Min Fast Open Cookie size in bytes */ @@ -203,9 +203,9 @@ diff -aurN a/include/linux/tcp.h b/include/linux/tcp.h }; static inline struct tcp_timewait_sock *tcp_twsk(const struct sock *sk) -diff -aurN a/include/net/inet_common.h b/include/net/inet_common.h ---- a/include/net/inet_common.h 2018-11-04 14:52:51.000000000 +0100 -+++ b/include/net/inet_common.h 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/include/net/inet_common.h mptcp-mptcp_v0.94/include/net/inet_common.h +--- linux-4.14.89/include/net/inet_common.h 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/include/net/inet_common.h 2018-12-20 12:51:01.000000000 +0100 @@ -2,6 +2,8 @@ #ifndef _INET_COMMON_H #define _INET_COMMON_H @@ -224,9 +224,9 @@ diff -aurN a/include/net/inet_common.h b/include/net/inet_common.h int inet_release(struct socket *sock); int inet_stream_connect(struct socket *sock, struct sockaddr *uaddr, int addr_len, int flags); -diff -aurN a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h ---- a/include/net/inet_connection_sock.h 2018-11-04 14:52:51.000000000 +0100 -+++ b/include/net/inet_connection_sock.h 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/include/net/inet_connection_sock.h mptcp-mptcp_v0.94/include/net/inet_connection_sock.h +--- linux-4.14.89/include/net/inet_connection_sock.h 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/include/net/inet_connection_sock.h 2018-12-20 12:51:01.000000000 +0100 @@ -30,6 +30,7 @@ struct inet_bind_bucket; @@ -235,9 +235,9 @@ diff -aurN a/include/net/inet_connection_sock.h b/include/net/inet_connection_so /* * Pointers to address related TCP functions -diff -aurN a/include/net/inet_sock.h b/include/net/inet_sock.h ---- a/include/net/inet_sock.h 2018-11-04 14:52:51.000000000 +0100 -+++ b/include/net/inet_sock.h 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/include/net/inet_sock.h mptcp-mptcp_v0.94/include/net/inet_sock.h +--- linux-4.14.89/include/net/inet_sock.h 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/include/net/inet_sock.h 2018-12-20 12:51:01.000000000 +0100 @@ -90,7 +90,9 @@ wscale_ok : 1, ecn_ok : 1, @@ -249,9 +249,9 @@ diff -aurN a/include/net/inet_sock.h b/include/net/inet_sock.h u32 ir_mark; union { struct ip_options_rcu __rcu *ireq_opt; -diff -aurN a/include/net/mptcp.h b/include/net/mptcp.h ---- a/include/net/mptcp.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/include/net/mptcp.h 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/include/net/mptcp.h mptcp-mptcp_v0.94/include/net/mptcp.h +--- linux-4.14.89/include/net/mptcp.h 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.94/include/net/mptcp.h 2018-12-20 12:51:01.000000000 +0100 @@ -0,0 +1,1510 @@ +/* + * MPTCP implementation @@ -1763,9 +1763,9 @@ diff -aurN a/include/net/mptcp.h b/include/net/mptcp.h +#endif /* CONFIG_MPTCP */ + +#endif /* _MPTCP_H */ -diff -aurN a/include/net/mptcp_v4.h b/include/net/mptcp_v4.h ---- a/include/net/mptcp_v4.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/include/net/mptcp_v4.h 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/include/net/mptcp_v4.h mptcp-mptcp_v0.94/include/net/mptcp_v4.h +--- linux-4.14.89/include/net/mptcp_v4.h 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.94/include/net/mptcp_v4.h 2018-12-20 12:51:01.000000000 +0100 @@ -0,0 +1,68 @@ +/* + * MPTCP implementation @@ -1835,9 +1835,9 @@ diff -aurN a/include/net/mptcp_v4.h b/include/net/mptcp_v4.h +#endif /* CONFIG_MPTCP */ + +#endif /* MPTCP_V4_H_ */ -diff -aurN a/include/net/mptcp_v6.h b/include/net/mptcp_v6.h ---- a/include/net/mptcp_v6.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/include/net/mptcp_v6.h 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/include/net/mptcp_v6.h mptcp-mptcp_v0.94/include/net/mptcp_v6.h +--- linux-4.14.89/include/net/mptcp_v6.h 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.94/include/net/mptcp_v6.h 2018-12-20 12:51:01.000000000 +0100 @@ -0,0 +1,69 @@ +/* + * MPTCP implementation @@ -1908,9 +1908,9 @@ diff -aurN a/include/net/mptcp_v6.h b/include/net/mptcp_v6.h +#endif /* CONFIG_MPTCP */ + +#endif /* _MPTCP_V6_H */ -diff -aurN a/include/net/net_namespace.h b/include/net/net_namespace.h ---- a/include/net/net_namespace.h 2018-11-04 14:52:51.000000000 +0100 -+++ b/include/net/net_namespace.h 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/include/net/net_namespace.h mptcp-mptcp_v0.94/include/net/net_namespace.h +--- linux-4.14.89/include/net/net_namespace.h 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/include/net/net_namespace.h 2018-12-20 12:51:01.000000000 +0100 @@ -18,6 +18,7 @@ #include #include @@ -1929,9 +1929,9 @@ diff -aurN a/include/net/net_namespace.h b/include/net/net_namespace.h #if IS_ENABLED(CONFIG_IEEE802154_6LOWPAN) struct netns_ieee802154_lowpan ieee802154_lowpan; #endif -diff -aurN a/include/net/netns/mptcp.h b/include/net/netns/mptcp.h ---- a/include/net/netns/mptcp.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/include/net/netns/mptcp.h 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/include/net/netns/mptcp.h mptcp-mptcp_v0.94/include/net/netns/mptcp.h +--- linux-4.14.89/include/net/netns/mptcp.h 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.94/include/net/netns/mptcp.h 2018-12-20 12:51:01.000000000 +0100 @@ -0,0 +1,52 @@ +/* + * MPTCP implementation - MPTCP namespace @@ -1985,9 +1985,9 @@ diff -aurN a/include/net/netns/mptcp.h b/include/net/netns/mptcp.h +}; + +#endif /* __NETNS_MPTCP_H__ */ -diff -aurN a/include/net/snmp.h b/include/net/snmp.h ---- a/include/net/snmp.h 2018-11-04 14:52:51.000000000 +0100 -+++ b/include/net/snmp.h 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/include/net/snmp.h mptcp-mptcp_v0.94/include/net/snmp.h +--- linux-4.14.89/include/net/snmp.h 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/include/net/snmp.h 2018-12-20 12:51:01.000000000 +0100 @@ -91,7 +91,6 @@ atomic_long_t mibs[ICMP6MSG_MIB_MAX]; }; @@ -1996,9 +1996,9 @@ diff -aurN a/include/net/snmp.h b/include/net/snmp.h /* TCP */ #define TCP_MIB_MAX __TCP_MIB_MAX struct tcp_mib { -diff -aurN a/include/net/sock.h b/include/net/sock.h ---- a/include/net/sock.h 2018-11-04 14:52:51.000000000 +0100 -+++ b/include/net/sock.h 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/include/net/sock.h mptcp-mptcp_v0.94/include/net/sock.h +--- linux-4.14.89/include/net/sock.h 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/include/net/sock.h 2018-12-20 12:51:01.000000000 +0100 @@ -771,6 +771,7 @@ SOCK_FILTER_LOCKED, /* Filter cannot be changed anymore */ SOCK_SELECT_ERR_QUEUE, /* Wake select on error queue */ @@ -2015,9 +2015,9 @@ diff -aurN a/include/net/sock.h b/include/net/sock.h /* Keeping track of sockets in use */ #ifdef CONFIG_PROC_FS -diff -aurN a/include/net/tcp.h b/include/net/tcp.h ---- a/include/net/tcp.h 2018-11-04 14:52:51.000000000 +0100 -+++ b/include/net/tcp.h 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/include/net/tcp.h mptcp-mptcp_v0.94/include/net/tcp.h +--- linux-4.14.89/include/net/tcp.h 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/include/net/tcp.h 2018-12-20 12:51:01.000000000 +0100 @@ -185,6 +185,7 @@ #define TCPOPT_SACK 5 /* SACK Block */ #define TCPOPT_TIMESTAMP 8 /* Better RTT estimations/PAWS */ @@ -2338,9 +2338,9 @@ diff -aurN a/include/net/tcp.h b/include/net/tcp.h const struct sock *sk, struct sk_buff *skb, __u16 *mss) { -diff -aurN a/include/net/tcp_states.h b/include/net/tcp_states.h ---- a/include/net/tcp_states.h 2018-11-04 14:52:51.000000000 +0100 -+++ b/include/net/tcp_states.h 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/include/net/tcp_states.h mptcp-mptcp_v0.94/include/net/tcp_states.h +--- linux-4.14.89/include/net/tcp_states.h 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/include/net/tcp_states.h 2018-12-20 12:51:01.000000000 +0100 @@ -26,6 +26,7 @@ TCP_LISTEN, TCP_CLOSING, /* Now a valid state */ @@ -2357,9 +2357,9 @@ diff -aurN a/include/net/tcp_states.h b/include/net/tcp_states.h }; #endif /* _LINUX_TCP_STATES_H */ -diff -aurN a/include/net/transp_v6.h b/include/net/transp_v6.h ---- a/include/net/transp_v6.h 2018-11-04 14:52:51.000000000 +0100 -+++ b/include/net/transp_v6.h 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/include/net/transp_v6.h mptcp-mptcp_v0.94/include/net/transp_v6.h +--- linux-4.14.89/include/net/transp_v6.h 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/include/net/transp_v6.h 2018-12-20 12:51:01.000000000 +0100 @@ -59,6 +59,8 @@ /* address family specific functions */ @@ -2369,9 +2369,9 @@ diff -aurN a/include/net/transp_v6.h b/include/net/transp_v6.h void inet6_destroy_sock(struct sock *sk); -diff -aurN a/include/uapi/linux/if.h b/include/uapi/linux/if.h ---- a/include/uapi/linux/if.h 2018-11-04 14:52:51.000000000 +0100 -+++ b/include/uapi/linux/if.h 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/include/uapi/linux/if.h mptcp-mptcp_v0.94/include/uapi/linux/if.h +--- linux-4.14.89/include/uapi/linux/if.h 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/include/uapi/linux/if.h 2018-12-20 12:51:01.000000000 +0100 @@ -132,6 +132,9 @@ #define IFF_ECHO IFF_ECHO #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ @@ -2382,9 +2382,9 @@ diff -aurN a/include/uapi/linux/if.h b/include/uapi/linux/if.h #define IFF_VOLATILE (IFF_LOOPBACK|IFF_POINTOPOINT|IFF_BROADCAST|IFF_ECHO|\ IFF_MASTER|IFF_SLAVE|IFF_RUNNING|IFF_LOWER_UP|IFF_DORMANT) -diff -aurN a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h ---- a/include/uapi/linux/tcp.h 2018-11-04 14:52:51.000000000 +0100 -+++ b/include/uapi/linux/tcp.h 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/include/uapi/linux/tcp.h mptcp-mptcp_v0.94/include/uapi/linux/tcp.h +--- linux-4.14.89/include/uapi/linux/tcp.h 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/include/uapi/linux/tcp.h 2018-12-20 12:51:01.000000000 +0100 @@ -18,9 +18,15 @@ #ifndef _UAPI_LINUX_TCP_H #define _UAPI_LINUX_TCP_H @@ -2469,10 +2469,10 @@ diff -aurN a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h /* for TCP_MD5SIG socket option */ #define TCP_MD5SIG_MAXKEYLEN 80 -diff -aurN a/net/core/dev.c b/net/core/dev.c ---- a/net/core/dev.c 2018-11-04 14:52:51.000000000 +0100 -+++ b/net/core/dev.c 2018-11-27 13:37:16.000000000 +0100 -@@ -6762,7 +6762,7 @@ +diff -aurN linux-4.14.89/net/core/dev.c mptcp-mptcp_v0.94/net/core/dev.c +--- linux-4.14.89/net/core/dev.c 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/core/dev.c 2018-12-20 12:51:01.000000000 +0100 +@@ -6766,7 +6766,7 @@ dev->flags = (flags & (IFF_DEBUG | IFF_NOTRAILERS | IFF_NOARP | IFF_DYNAMIC | IFF_MULTICAST | IFF_PORTSEL | @@ -2481,9 +2481,9 @@ diff -aurN a/net/core/dev.c b/net/core/dev.c (dev->flags & (IFF_UP | IFF_VOLATILE | IFF_PROMISC | IFF_ALLMULTI)); -diff -aurN a/net/core/skbuff.c b/net/core/skbuff.c ---- a/net/core/skbuff.c 2018-11-04 14:52:51.000000000 +0100 -+++ b/net/core/skbuff.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/core/skbuff.c mptcp-mptcp_v0.94/net/core/skbuff.c +--- linux-4.14.89/net/core/skbuff.c 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/core/skbuff.c 2018-12-20 12:51:01.000000000 +0100 @@ -532,7 +532,7 @@ skb_drop_list(&skb_shinfo(skb)->frag_list); } @@ -2502,9 +2502,9 @@ diff -aurN a/net/core/skbuff.c b/net/core/skbuff.c { __copy_skb_header(new, old); -diff -aurN a/net/core/sock.c b/net/core/sock.c ---- a/net/core/sock.c 2018-11-04 14:52:51.000000000 +0100 -+++ b/net/core/sock.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/core/sock.c mptcp-mptcp_v0.94/net/core/sock.c +--- linux-4.14.89/net/core/sock.c 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/core/sock.c 2018-12-20 12:51:01.000000000 +0100 @@ -139,6 +139,11 @@ #include @@ -2564,9 +2564,9 @@ diff -aurN a/net/core/sock.c b/net/core/sock.c mem_cgroup_sk_alloc(newsk); cgroup_sk_alloc(&newsk->sk_cgrp_data); -diff -aurN a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c ---- a/net/ipv4/af_inet.c 2018-11-04 14:52:51.000000000 +0100 -+++ b/net/ipv4/af_inet.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/ipv4/af_inet.c mptcp-mptcp_v0.94/net/ipv4/af_inet.c +--- linux-4.14.89/net/ipv4/af_inet.c 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/ipv4/af_inet.c 2018-12-20 12:51:01.000000000 +0100 @@ -104,6 +104,7 @@ #include #include @@ -2629,9 +2629,9 @@ diff -aurN a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c /* Setup TCP slab cache for open requests. */ tcp_init(); -diff -aurN a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c ---- a/net/ipv4/inet_connection_sock.c 2018-11-04 14:52:51.000000000 +0100 -+++ b/net/ipv4/inet_connection_sock.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/ipv4/inet_connection_sock.c mptcp-mptcp_v0.94/net/ipv4/inet_connection_sock.c +--- linux-4.14.89/net/ipv4/inet_connection_sock.c 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/ipv4/inet_connection_sock.c 2018-12-20 12:51:01.000000000 +0100 @@ -23,6 +23,7 @@ #include #include @@ -2685,9 +2685,9 @@ diff -aurN a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c sock_put(child); cond_resched(); -diff -aurN a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c ---- a/net/ipv4/ip_sockglue.c 2018-11-04 14:52:51.000000000 +0100 -+++ b/net/ipv4/ip_sockglue.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/ipv4/ip_sockglue.c mptcp-mptcp_v0.94/net/ipv4/ip_sockglue.c +--- linux-4.14.89/net/ipv4/ip_sockglue.c 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/ipv4/ip_sockglue.c 2018-12-20 12:51:01.000000000 +0100 @@ -44,6 +44,8 @@ #endif #include @@ -2715,9 +2715,9 @@ diff -aurN a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c } break; case IP_TTL: -diff -aurN a/net/ipv4/Kconfig b/net/ipv4/Kconfig ---- a/net/ipv4/Kconfig 2018-11-04 14:52:51.000000000 +0100 -+++ b/net/ipv4/Kconfig 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/ipv4/Kconfig mptcp-mptcp_v0.94/net/ipv4/Kconfig +--- linux-4.14.89/net/ipv4/Kconfig 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/ipv4/Kconfig 2018-12-20 12:51:01.000000000 +0100 @@ -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. @@ -2787,9 +2787,9 @@ diff -aurN a/net/ipv4/Kconfig b/net/ipv4/Kconfig default "reno" if DEFAULT_RENO default "dctcp" if DEFAULT_DCTCP default "cdg" if DEFAULT_CDG -diff -aurN a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c ---- a/net/ipv4/syncookies.c 2018-11-04 14:52:51.000000000 +0100 -+++ b/net/ipv4/syncookies.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/ipv4/syncookies.c mptcp-mptcp_v0.94/net/ipv4/syncookies.c +--- linux-4.14.89/net/ipv4/syncookies.c 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/ipv4/syncookies.c 2018-12-20 12:51:01.000000000 +0100 @@ -16,6 +16,8 @@ #include #include @@ -2902,9 +2902,9 @@ diff -aurN a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c ireq->rcv_wscale = rcv_wscale; ireq->ecn_ok = cookie_ecn_ok(&tcp_opt, sock_net(sk), &rt->dst); -diff -aurN a/net/ipv4/tcp.c b/net/ipv4/tcp.c ---- a/net/ipv4/tcp.c 2018-11-04 14:52:51.000000000 +0100 -+++ b/net/ipv4/tcp.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/ipv4/tcp.c mptcp-mptcp_v0.94/net/ipv4/tcp.c +--- linux-4.14.89/net/ipv4/tcp.c 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/ipv4/tcp.c 2018-12-20 12:51:01.000000000 +0100 @@ -273,6 +273,7 @@ #include @@ -3221,7 +3221,7 @@ diff -aurN a/net/ipv4/tcp.c b/net/ipv4/tcp.c } else if (sock_flag(sk, SOCK_LINGER) && !sk->sk_lingertime) { /* Check zero linger _after_ checking for unread data. */ sk->sk_prot->disconnect(sk, 0); -@@ -2252,7 +2341,7 @@ +@@ -2246,7 +2335,7 @@ struct tcp_sock *tp = tcp_sk(sk); if (tp->linger2 < 0) { tcp_set_state(sk, TCP_CLOSE); @@ -3230,7 +3230,7 @@ diff -aurN a/net/ipv4/tcp.c b/net/ipv4/tcp.c __NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPABORTONLINGER); } else { -@@ -2262,7 +2351,8 @@ +@@ -2256,7 +2345,8 @@ inet_csk_reset_keepalive_timer(sk, tmo - TCP_TIMEWAIT_LEN); } else { @@ -3240,7 +3240,7 @@ diff -aurN a/net/ipv4/tcp.c b/net/ipv4/tcp.c goto out; } } -@@ -2271,7 +2361,7 @@ +@@ -2265,7 +2355,7 @@ sk_mem_reclaim(sk); if (tcp_check_oom(sk, 0)) { tcp_set_state(sk, TCP_CLOSE); @@ -3249,7 +3249,7 @@ diff -aurN a/net/ipv4/tcp.c b/net/ipv4/tcp.c __NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPABORTONMEMORY); } else if (!check_net(sock_net(sk))) { -@@ -2299,15 +2389,6 @@ +@@ -2294,15 +2384,6 @@ } EXPORT_SYMBOL(tcp_close); @@ -3265,7 +3265,7 @@ diff -aurN a/net/ipv4/tcp.c b/net/ipv4/tcp.c int tcp_disconnect(struct sock *sk, int flags) { struct inet_sock *inet = inet_sk(sk); -@@ -2330,7 +2411,7 @@ +@@ -2325,7 +2406,7 @@ /* The last check adjusts for discrepancy of Linux wrt. RFC * states */ @@ -3274,7 +3274,7 @@ diff -aurN a/net/ipv4/tcp.c b/net/ipv4/tcp.c sk->sk_err = ECONNRESET; } else if (old_state == TCP_SYN_SENT) sk->sk_err = ECONNRESET; -@@ -2346,6 +2427,13 @@ +@@ -2341,6 +2422,13 @@ if (!(sk->sk_userlocks & SOCK_BINDADDR_LOCK)) inet_reset_saddr(sk); @@ -3288,7 +3288,7 @@ diff -aurN a/net/ipv4/tcp.c b/net/ipv4/tcp.c sk->sk_shutdown = 0; sock_reset_flag(sk, SOCK_DONE); tp->srtt_us = 0; -@@ -2528,6 +2616,61 @@ +@@ -2523,6 +2611,61 @@ release_sock(sk); return err; } @@ -3350,7 +3350,7 @@ diff -aurN a/net/ipv4/tcp.c b/net/ipv4/tcp.c default: /* fallthru */ break; -@@ -2705,6 +2848,12 @@ +@@ -2700,6 +2843,12 @@ break; case TCP_DEFER_ACCEPT: @@ -3363,7 +3363,7 @@ diff -aurN a/net/ipv4/tcp.c b/net/ipv4/tcp.c /* Translate value in seconds to number of retransmits */ icsk->icsk_accept_queue.rskq_defer_accept = secs_to_retrans(val, TCP_TIMEOUT_INIT / HZ, -@@ -2732,7 +2881,7 @@ +@@ -2727,7 +2876,7 @@ (TCPF_ESTABLISHED | TCPF_CLOSE_WAIT) && inet_csk_ack_scheduled(sk)) { icsk->icsk_ack.pending |= ICSK_ACK_PUSHED; @@ -3372,7 +3372,7 @@ diff -aurN a/net/ipv4/tcp.c b/net/ipv4/tcp.c if (!(val & 1)) icsk->icsk_ack.pingpong = 1; } -@@ -2793,6 +2942,28 @@ +@@ -2788,6 +2937,28 @@ tp->notsent_lowat = val; sk->sk_write_space(sk); break; @@ -3401,7 +3401,7 @@ diff -aurN a/net/ipv4/tcp.c b/net/ipv4/tcp.c default: err = -ENOPROTOOPT; break; -@@ -3220,6 +3391,75 @@ +@@ -3215,6 +3386,75 @@ } return 0; } @@ -3477,7 +3477,7 @@ diff -aurN a/net/ipv4/tcp.c b/net/ipv4/tcp.c default: return -ENOPROTOOPT; } -@@ -3394,7 +3634,9 @@ +@@ -3389,7 +3629,9 @@ if (sk->sk_state == TCP_SYN_SENT || sk->sk_state == TCP_SYN_RECV) TCP_INC_STATS(sock_net(sk), TCP_MIB_ATTEMPTFAILS); @@ -3487,7 +3487,7 @@ diff -aurN a/net/ipv4/tcp.c b/net/ipv4/tcp.c tcp_clear_xmit_timers(sk); if (req) reqsk_fastopen_remove(sk, req, false); -@@ -3410,6 +3652,8 @@ +@@ -3405,6 +3647,8 @@ int tcp_abort(struct sock *sk, int err) { @@ -3496,7 +3496,7 @@ diff -aurN a/net/ipv4/tcp.c b/net/ipv4/tcp.c if (!sk_fullsock(sk)) { if (sk->sk_state == TCP_NEW_SYN_RECV) { struct request_sock *req = inet_reqsk(sk); -@@ -3423,7 +3667,7 @@ +@@ -3418,7 +3662,7 @@ } /* Don't race with userspace socket closes such as tcp_close. */ @@ -3505,7 +3505,7 @@ diff -aurN a/net/ipv4/tcp.c b/net/ipv4/tcp.c if (sk->sk_state == TCP_LISTEN) { tcp_set_state(sk, TCP_CLOSE); -@@ -3432,7 +3676,7 @@ +@@ -3427,7 +3671,7 @@ /* Don't race with BH socket closes such as inet_csk_listen_stop. */ local_bh_disable(); @@ -3514,7 +3514,7 @@ diff -aurN a/net/ipv4/tcp.c b/net/ipv4/tcp.c if (!sock_flag(sk, SOCK_DEAD)) { sk->sk_err = err; -@@ -3440,14 +3684,14 @@ +@@ -3435,14 +3679,14 @@ smp_wmb(); sk->sk_error_report(sk); if (tcp_need_reset(sk->sk_state)) @@ -3532,9 +3532,9 @@ diff -aurN a/net/ipv4/tcp.c b/net/ipv4/tcp.c return 0; } EXPORT_SYMBOL_GPL(tcp_abort); -diff -aurN a/net/ipv4/tcp_fastopen.c b/net/ipv4/tcp_fastopen.c ---- a/net/ipv4/tcp_fastopen.c 2018-11-04 14:52:51.000000000 +0100 -+++ b/net/ipv4/tcp_fastopen.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/ipv4/tcp_fastopen.c mptcp-mptcp_v0.94/net/ipv4/tcp_fastopen.c +--- linux-4.14.89/net/ipv4/tcp_fastopen.c 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/ipv4/tcp_fastopen.c 2018-12-20 12:51:01.000000000 +0100 @@ -9,6 +9,7 @@ #include #include @@ -3587,9 +3587,9 @@ diff -aurN a/net/ipv4/tcp_fastopen.c b/net/ipv4/tcp_fastopen.c /* tcp_conn_request() is sending the SYNACK, * and queues the child into listener accept queue. */ -diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c ---- a/net/ipv4/tcp_input.c 2018-11-04 14:52:51.000000000 +0100 -+++ b/net/ipv4/tcp_input.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/ipv4/tcp_input.c mptcp-mptcp_v0.94/net/ipv4/tcp_input.c +--- linux-4.14.89/net/ipv4/tcp_input.c 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/ipv4/tcp_input.c 2018-12-20 12:51:01.000000000 +0100 @@ -76,6 +76,9 @@ #include #include @@ -4164,14 +4164,19 @@ diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c if (tp->rx_opt.saw_tstamp && tp->rx_opt.rcv_tsecr) tp->rx_opt.rcv_tsecr -= tp->tsoffset; -@@ -5724,6 +5819,30 @@ +@@ -5724,6 +5819,35 @@ tcp_init_wl(tp, TCP_SKB_CB(skb)->seq); tcp_ack(sk, skb, FLAG_SLOWPATH); + if (tp->request_mptcp || mptcp(tp)) { + int ret; ++ ++ rcu_read_lock(); ++ local_bh_disable(); + ret = mptcp_rcv_synsent_state_process(sk, &sk, + skb, &mopt); ++ local_bh_enable(); ++ rcu_read_unlock(); + + /* May have changed if we support MPTCP */ + tp = tcp_sk(sk); @@ -4195,7 +4200,7 @@ diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c /* Ok.. it's good. Set up sequence numbers and * move to established. */ -@@ -5750,6 +5869,11 @@ +@@ -5750,6 +5874,11 @@ tp->tcp_header_len = sizeof(struct tcphdr); } @@ -4207,7 +4212,7 @@ diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c if (tcp_is_sack(tp) && sysctl_tcp_fack) tcp_enable_fack(tp); -@@ -5775,9 +5899,12 @@ +@@ -5775,9 +5904,12 @@ } if (fastopen_fail) return -1; @@ -4222,7 +4227,7 @@ diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c /* Save one ACK. Data will be ready after * several ticks, if write_pending is set. * -@@ -5816,6 +5943,7 @@ +@@ -5816,6 +5948,7 @@ tcp_paws_reject(&tp->rx_opt, 0)) goto discard_and_undo; @@ -4230,7 +4235,7 @@ diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c if (th->syn) { /* We see SYN without ACK. It is attempt of * simultaneous connect with crossed SYNs. -@@ -5832,6 +5960,11 @@ +@@ -5832,6 +5965,11 @@ tp->tcp_header_len = sizeof(struct tcphdr); } @@ -4242,7 +4247,7 @@ diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c tp->rcv_nxt = TCP_SKB_CB(skb)->seq + 1; tp->copied_seq = tp->rcv_nxt; tp->rcv_wup = TCP_SKB_CB(skb)->seq + 1; -@@ -5890,6 +6023,7 @@ +@@ -5890,6 +6028,7 @@ */ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb) @@ -4250,7 +4255,7 @@ diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c { struct tcp_sock *tp = tcp_sk(sk); struct inet_connection_sock *icsk = inet_csk(sk); -@@ -5932,6 +6066,16 @@ +@@ -5932,6 +6071,16 @@ tp->rx_opt.saw_tstamp = 0; tcp_mstamp_refresh(tp); queued = tcp_rcv_synsent_state_process(sk, skb, th); @@ -4267,16 +4272,7 @@ diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c if (queued >= 0) return queued; -@@ -5939,6 +6083,8 @@ - tcp_urg(sk, skb, th); - __kfree_skb(skb); - tcp_data_snd_check(sk); -+ if (mptcp(tp) && is_master_tp(tp)) -+ bh_unlock_sock(sk); - return 0; - } - -@@ -5989,7 +6135,7 @@ +@@ -5989,7 +6138,7 @@ tcp_mtup_init(sk); tp->copied_seq = tp->rcv_nxt; @@ -4285,7 +4281,7 @@ diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c } smp_mb(); tcp_set_state(sk, TCP_ESTABLISHED); -@@ -6008,6 +6154,8 @@ +@@ -6008,6 +6157,8 @@ if (tp->rx_opt.tstamp_ok) tp->advmss -= TCPOLEN_TSTAMP_ALIGNED; @@ -4294,7 +4290,7 @@ diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c if (req) { /* Re-arm the timer because data may have been sent out. -@@ -6030,6 +6178,16 @@ +@@ -6030,6 +6181,16 @@ tcp_initialize_rcv_mss(sk); tcp_fast_path_on(tp); @@ -4311,7 +4307,7 @@ diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c break; case TCP_FIN_WAIT1: { -@@ -6077,7 +6235,8 @@ +@@ -6077,7 +6238,8 @@ tmo = tcp_fin_time(sk); if (tmo > TCP_TIMEWAIT_LEN) { inet_csk_reset_keepalive_timer(sk, tmo - TCP_TIMEWAIT_LEN); @@ -4321,7 +4317,7 @@ diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c /* Bad case. We could lose such FIN otherwise. * It is not a big problem, but it looks confusing * and not so rare event. We still can lose it now, -@@ -6086,7 +6245,7 @@ +@@ -6086,7 +6248,7 @@ */ inet_csk_reset_keepalive_timer(sk, tmo); } else { @@ -4330,7 +4326,7 @@ diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c goto discard; } break; -@@ -6094,7 +6253,7 @@ +@@ -6094,7 +6256,7 @@ case TCP_CLOSING: if (tp->snd_una == tp->write_seq) { @@ -4339,7 +4335,7 @@ diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c goto discard; } break; -@@ -6106,6 +6265,9 @@ +@@ -6106,6 +6268,9 @@ goto discard; } break; @@ -4349,7 +4345,7 @@ diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c } /* step 6: check the URG bit */ -@@ -6126,7 +6288,8 @@ +@@ -6126,7 +6291,8 @@ */ if (sk->sk_shutdown & RCV_SHUTDOWN) { if (TCP_SKB_CB(skb)->end_seq != TCP_SKB_CB(skb)->seq && @@ -4359,7 +4355,7 @@ diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPABORTONDATA); tcp_reset(sk); return 1; -@@ -6223,6 +6386,8 @@ +@@ -6223,6 +6389,8 @@ ireq->wscale_ok = rx_opt->wscale_ok; ireq->acked = 0; ireq->ecn_ok = 0; @@ -4368,7 +4364,7 @@ diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c ireq->ir_rmt_port = tcp_hdr(skb)->source; ireq->ir_num = ntohs(tcp_hdr(skb)->dest); ireq->ir_mark = inet_request_mark(sk, skb); -@@ -6317,12 +6482,17 @@ +@@ -6317,12 +6485,17 @@ /* TW buckets are converted to open requests without * limitations, they conserve resources and peer is * evidently real one. @@ -4387,7 +4383,7 @@ diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c } if (sk_acceptq_is_full(sk)) { -@@ -6340,8 +6510,8 @@ +@@ -6340,8 +6513,8 @@ tcp_clear_options(&tmp_opt); tmp_opt.mss_clamp = af_ops->mss_clamp; tmp_opt.user_mss = tp->rx_opt.user_mss; @@ -4398,7 +4394,7 @@ diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c if (want_cookie && !tmp_opt.saw_tstamp) tcp_clear_options(&tmp_opt); -@@ -6353,7 +6523,8 @@ +@@ -6353,7 +6526,8 @@ /* Note: tcp_v6_init_req() might override ir_iif for link locals */ inet_rsk(req)->ir_iif = inet_request_bound_dev_if(sk, skb); @@ -4408,7 +4404,7 @@ diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c if (security_inet_conn_request(sk, skb, req)) goto drop_and_free; -@@ -6389,7 +6560,7 @@ +@@ -6389,7 +6563,7 @@ tcp_ecn_create_request(req, skb, sk, dst); if (want_cookie) { @@ -4417,7 +4413,7 @@ diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c req->cookie_ts = tmp_opt.tstamp_ok; if (!tmp_opt.tstamp_ok) inet_rsk(req)->ecn_ok = 0; -@@ -6403,12 +6574,18 @@ +@@ -6403,12 +6577,18 @@ fastopen_sk = tcp_try_fastopen(sk, skb, req, &foc); } if (fastopen_sk) { @@ -4437,9 +4433,9 @@ diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c sock_put(fastopen_sk); } else { tcp_rsk(req)->tfo_listener = false; -diff -aurN a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c ---- a/net/ipv4/tcp_ipv4.c 2018-11-04 14:52:51.000000000 +0100 -+++ b/net/ipv4/tcp_ipv4.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/ipv4/tcp_ipv4.c mptcp-mptcp_v0.94/net/ipv4/tcp_ipv4.c +--- linux-4.14.89/net/ipv4/tcp_ipv4.c 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/ipv4/tcp_ipv4.c 2018-12-20 12:51:01.000000000 +0100 @@ -67,6 +67,8 @@ #include #include @@ -4933,9 +4929,9 @@ diff -aurN a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c }; EXPORT_SYMBOL(tcp_prot); -diff -aurN a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c ---- a/net/ipv4/tcp_minisocks.c 2018-11-04 14:52:51.000000000 +0100 -+++ b/net/ipv4/tcp_minisocks.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.94/net/ipv4/tcp_minisocks.c +--- linux-4.14.89/net/ipv4/tcp_minisocks.c 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/ipv4/tcp_minisocks.c 2018-12-20 12:51:01.000000000 +0100 @@ -18,11 +18,13 @@ * Jorge Cwik, */ @@ -5146,9 +5142,9 @@ diff -aurN a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c sock_put(child); return ret; } -diff -aurN a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c ---- a/net/ipv4/tcp_output.c 2018-11-04 14:52:51.000000000 +0100 -+++ b/net/ipv4/tcp_output.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/ipv4/tcp_output.c mptcp-mptcp_v0.94/net/ipv4/tcp_output.c +--- linux-4.14.89/net/ipv4/tcp_output.c 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/ipv4/tcp_output.c 2018-12-20 12:51:01.000000000 +0100 @@ -36,6 +36,12 @@ #define pr_fmt(fmt) "TCP: " fmt @@ -5573,15 +5569,16 @@ diff -aurN a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c { u32 end_seq = TCP_SKB_CB(skb)->end_seq; -@@ -1893,4 +1933,7 @@ - struct sk_buff *head; - int win_divisor; +@@ -1969,7 +2009,7 @@ + } + /* If this packet won't get more data, do not wait. */ +- if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN) + if ((TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN) || mptcp_is_data_fin(skb)) -+ goto send_now; -+ - if (icsk->icsk_ca_state >= TCP_CA_Recovery) -@@ -2266,7 +2306,7 @@ + goto send_now; + + return true; +@@ -2282,7 +2322,7 @@ * Returns true, if no segments are in flight and we have queued segments, * but cannot send anything now because of SWS or another problem. */ @@ -5590,7 +5587,7 @@ diff -aurN a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c int push_one, gfp_t gfp) { struct tcp_sock *tp = tcp_sk(sk); -@@ -2280,7 +2320,12 @@ +@@ -2296,7 +2336,12 @@ sent_pkts = 0; tcp_mstamp_refresh(tp); @@ -5604,7 +5601,7 @@ diff -aurN a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c /* Do MTU probing. */ result = tcp_mtu_probe(sk); if (!result) { -@@ -2378,7 +2423,8 @@ +@@ -2394,7 +2439,8 @@ if (push_one != 2) tcp_schedule_loss_probe(sk, false); is_cwnd_limited |= (tcp_packets_in_flight(tp) >= tp->snd_cwnd); @@ -5614,7 +5611,7 @@ diff -aurN a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c return false; } return !tp->packets_out && tcp_send_head(sk); -@@ -2463,7 +2509,7 @@ +@@ -2479,7 +2525,7 @@ if (skb) { if (tcp_snd_wnd_test(tp, skb, mss)) { pcount = tp->packets_out; @@ -5623,7 +5620,7 @@ diff -aurN a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c if (tp->packets_out > pcount) goto probe_sent; goto rearm_timer; -@@ -2526,8 +2572,8 @@ +@@ -2546,8 +2592,8 @@ if (unlikely(sk->sk_state == TCP_CLOSE)) return; @@ -5634,7 +5631,7 @@ diff -aurN a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c tcp_check_probe_timer(sk); } -@@ -2540,7 +2586,8 @@ +@@ -2560,7 +2606,8 @@ BUG_ON(!skb || skb->len < mss_now); @@ -5644,7 +5641,7 @@ diff -aurN a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c } /* This function returns the amount that we can raise the -@@ -2773,6 +2820,10 @@ +@@ -2793,6 +2840,10 @@ if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_SYN) return; @@ -5655,7 +5652,7 @@ diff -aurN a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c tcp_for_write_queue_from_safe(skb, tmp, sk) { if (!tcp_can_collapse(sk, skb)) break; -@@ -3230,7 +3281,7 @@ +@@ -3250,7 +3301,7 @@ /* RFC1323: The window in SYN & SYN/ACK segments is never scaled. */ th->window = htons(min(req->rsk_rcv_wnd, 65535U)); @@ -5664,7 +5661,7 @@ diff -aurN a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c th->doff = (tcp_header_size >> 2); __TCP_INC_STATS(sock_net(sk), TCP_MIB_OUTSEGS); -@@ -3311,13 +3362,13 @@ +@@ -3331,13 +3382,13 @@ if (rcv_wnd == 0) rcv_wnd = dst_metric(dst, RTAX_INITRWND); @@ -5685,7 +5682,7 @@ diff -aurN a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c tp->rx_opt.rcv_wscale = rcv_wscale; tp->rcv_ssthresh = tp->rcv_wnd; -@@ -3342,6 +3393,36 @@ +@@ -3362,6 +3413,36 @@ inet_csk(sk)->icsk_rto = tcp_timeout_init(sk); inet_csk(sk)->icsk_retransmits = 0; tcp_clear_retrans(tp); @@ -5722,7 +5719,7 @@ diff -aurN a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c } static void tcp_connect_queue_skb(struct sock *sk, struct sk_buff *skb) -@@ -3602,6 +3683,7 @@ +@@ -3622,6 +3703,7 @@ { __tcp_send_ack(sk, tcp_sk(sk)->rcv_nxt); } @@ -5730,7 +5727,7 @@ diff -aurN a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c /* This routine sends a packet with an out of date sequence * number. It assumes the other end will try to ack it. -@@ -3614,7 +3696,7 @@ +@@ -3634,7 +3716,7 @@ * one is with SEG.SEQ=SND.UNA to deliver urgent pointer, another is * out-of-date with SND.UNA-1 to probe window. */ @@ -5739,7 +5736,7 @@ diff -aurN a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c { struct tcp_sock *tp = tcp_sk(sk); struct sk_buff *skb; -@@ -3700,7 +3782,7 @@ +@@ -3720,7 +3802,7 @@ unsigned long probe_max; int err; @@ -5748,9 +5745,9 @@ diff -aurN a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c if (tp->packets_out || !tcp_send_head(sk)) { /* Cancel probe timer, if it is not required. */ -diff -aurN a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c ---- a/net/ipv4/tcp_timer.c 2018-11-04 14:52:51.000000000 +0100 -+++ b/net/ipv4/tcp_timer.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/ipv4/tcp_timer.c mptcp-mptcp_v0.94/net/ipv4/tcp_timer.c +--- linux-4.14.89/net/ipv4/tcp_timer.c 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/ipv4/tcp_timer.c 2018-12-20 12:51:01.000000000 +0100 @@ -20,6 +20,7 @@ #include @@ -5948,9 +5945,9 @@ diff -aurN a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c sock_put(sk); } -diff -aurN a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c ---- a/net/ipv6/addrconf.c 2018-11-04 14:52:51.000000000 +0100 -+++ b/net/ipv6/addrconf.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/ipv6/addrconf.c mptcp-mptcp_v0.94/net/ipv6/addrconf.c +--- linux-4.14.89/net/ipv6/addrconf.c 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/ipv6/addrconf.c 2018-12-20 12:51:01.000000000 +0100 @@ -928,6 +928,7 @@ kfree_rcu(ifp, rcu); @@ -5959,9 +5956,9 @@ diff -aurN a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c static void ipv6_link_dev_addr(struct inet6_dev *idev, struct inet6_ifaddr *ifp) -diff -aurN a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c ---- a/net/ipv6/af_inet6.c 2018-11-04 14:52:51.000000000 +0100 -+++ b/net/ipv6/af_inet6.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/ipv6/af_inet6.c mptcp-mptcp_v0.94/net/ipv6/af_inet6.c +--- linux-4.14.89/net/ipv6/af_inet6.c 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/ipv6/af_inet6.c 2018-12-20 12:51:01.000000000 +0100 @@ -107,8 +107,7 @@ return (struct ipv6_pinfo *)(((u8 *)sk) + offset); } @@ -5972,9 +5969,9 @@ diff -aurN a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c { struct inet_sock *inet; struct ipv6_pinfo *np; -diff -aurN a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c ---- a/net/ipv6/ipv6_sockglue.c 2018-11-04 14:52:51.000000000 +0100 -+++ b/net/ipv6/ipv6_sockglue.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/ipv6/ipv6_sockglue.c mptcp-mptcp_v0.94/net/ipv6/ipv6_sockglue.c +--- linux-4.14.89/net/ipv6/ipv6_sockglue.c 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/ipv6/ipv6_sockglue.c 2018-12-20 12:51:01.000000000 +0100 @@ -48,6 +48,8 @@ #include #include @@ -5998,9 +5995,9 @@ diff -aurN a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c sk->sk_socket->ops = &inet_stream_ops; sk->sk_family = PF_INET; tcp_sync_mss(sk, icsk->icsk_pmtu_cookie); -diff -aurN a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c ---- a/net/ipv6/syncookies.c 2018-11-04 14:52:51.000000000 +0100 -+++ b/net/ipv6/syncookies.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/ipv6/syncookies.c mptcp-mptcp_v0.94/net/ipv6/syncookies.c +--- linux-4.14.89/net/ipv6/syncookies.c 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/ipv6/syncookies.c 2018-12-20 12:51:01.000000000 +0100 @@ -20,6 +20,8 @@ #include #include @@ -6082,9 +6079,9 @@ diff -aurN a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c ireq->rcv_wscale = rcv_wscale; ireq->ecn_ok = cookie_ecn_ok(&tcp_opt, sock_net(sk), dst); -diff -aurN a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c ---- a/net/ipv6/tcp_ipv6.c 2018-11-04 14:52:51.000000000 +0100 -+++ b/net/ipv6/tcp_ipv6.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.94/net/ipv6/tcp_ipv6.c +--- linux-4.14.89/net/ipv6/tcp_ipv6.c 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/ipv6/tcp_ipv6.c 2018-12-20 12:51:01.000000000 +0100 @@ -61,6 +61,8 @@ #include #include @@ -6706,9 +6703,9 @@ diff -aurN a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c }; /* thinking of making this const? Don't. -diff -aurN a/net/Kconfig b/net/Kconfig ---- a/net/Kconfig 2018-11-04 14:52:51.000000000 +0100 -+++ b/net/Kconfig 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/Kconfig mptcp-mptcp_v0.94/net/Kconfig +--- linux-4.14.89/net/Kconfig 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/Kconfig 2018-12-20 12:51:01.000000000 +0100 @@ -88,6 +88,7 @@ source "net/ipv4/Kconfig" source "net/ipv6/Kconfig" @@ -6717,9 +6714,9 @@ diff -aurN a/net/Kconfig b/net/Kconfig endif # if INET -diff -aurN a/net/Makefile b/net/Makefile ---- a/net/Makefile 2018-11-04 14:52:51.000000000 +0100 -+++ b/net/Makefile 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/Makefile mptcp-mptcp_v0.94/net/Makefile +--- linux-4.14.89/net/Makefile 2018-12-17 09:28:56.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/Makefile 2018-12-20 12:51:01.000000000 +0100 @@ -20,6 +20,7 @@ obj-$(CONFIG_XFRM) += xfrm/ obj-$(CONFIG_UNIX) += unix/ @@ -6728,9 +6725,9 @@ diff -aurN a/net/Makefile b/net/Makefile obj-$(CONFIG_PACKET) += packet/ obj-$(CONFIG_NET_KEY) += key/ obj-$(CONFIG_BRIDGE) += bridge/ -diff -aurN a/net/mptcp/Kconfig b/net/mptcp/Kconfig ---- a/net/mptcp/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ b/net/mptcp/Kconfig 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/mptcp/Kconfig mptcp-mptcp_v0.94/net/mptcp/Kconfig +--- linux-4.14.89/net/mptcp/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/mptcp/Kconfig 2018-12-20 12:51:01.000000000 +0100 @@ -0,0 +1,129 @@ +# +# MPTCP configuration @@ -6861,9 +6858,9 @@ diff -aurN a/net/mptcp/Kconfig b/net/mptcp/Kconfig + default "redundant" if DEFAULT_REDUNDANT + default "default" + -diff -aurN a/net/mptcp/Makefile b/net/mptcp/Makefile ---- a/net/mptcp/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ b/net/mptcp/Makefile 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/mptcp/Makefile mptcp-mptcp_v0.94/net/mptcp/Makefile +--- linux-4.14.89/net/mptcp/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/mptcp/Makefile 2018-12-20 12:51:01.000000000 +0100 @@ -0,0 +1,22 @@ +# +## Makefile for MultiPath TCP support code. @@ -6887,9 +6884,9 @@ diff -aurN a/net/mptcp/Makefile b/net/mptcp/Makefile + +mptcp-$(subst m,y,$(CONFIG_IPV6)) += mptcp_ipv6.o + -diff -aurN a/net/mptcp/mptcp_balia.c b/net/mptcp/mptcp_balia.c ---- a/net/mptcp/mptcp_balia.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/net/mptcp/mptcp_balia.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/mptcp/mptcp_balia.c mptcp-mptcp_v0.94/net/mptcp/mptcp_balia.c +--- linux-4.14.89/net/mptcp/mptcp_balia.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_balia.c 2018-12-20 12:51:01.000000000 +0100 @@ -0,0 +1,268 @@ +/* + * MPTCP implementation - Balia Congestion Control @@ -7159,9 +7156,9 @@ diff -aurN a/net/mptcp/mptcp_balia.c b/net/mptcp/mptcp_balia.c +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("MPTCP BALIA CONGESTION CONTROL ALGORITHM"); +MODULE_VERSION("0.1"); -diff -aurN a/net/mptcp/mptcp_binder.c b/net/mptcp/mptcp_binder.c ---- a/net/mptcp/mptcp_binder.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/net/mptcp/mptcp_binder.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/mptcp/mptcp_binder.c mptcp-mptcp_v0.94/net/mptcp/mptcp_binder.c +--- linux-4.14.89/net/mptcp/mptcp_binder.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_binder.c 2018-12-20 12:51:01.000000000 +0100 @@ -0,0 +1,486 @@ +#include + @@ -7649,9 +7646,9 @@ diff -aurN a/net/mptcp/mptcp_binder.c b/net/mptcp/mptcp_binder.c +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("BINDER MPTCP"); +MODULE_VERSION("0.1"); -diff -aurN a/net/mptcp/mptcp_coupled.c b/net/mptcp/mptcp_coupled.c ---- a/net/mptcp/mptcp_coupled.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/net/mptcp/mptcp_coupled.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/mptcp/mptcp_coupled.c mptcp-mptcp_v0.94/net/mptcp/mptcp_coupled.c +--- linux-4.14.89/net/mptcp/mptcp_coupled.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_coupled.c 2018-12-20 12:51:01.000000000 +0100 @@ -0,0 +1,271 @@ +/* + * MPTCP implementation - Linked Increase congestion control Algorithm (LIA) @@ -7924,9 +7921,9 @@ diff -aurN a/net/mptcp/mptcp_coupled.c b/net/mptcp/mptcp_coupled.c +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("MPTCP LINKED INCREASE CONGESTION CONTROL ALGORITHM"); +MODULE_VERSION("0.1"); -diff -aurN a/net/mptcp/mptcp_ctrl.c b/net/mptcp/mptcp_ctrl.c ---- a/net/mptcp/mptcp_ctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/net/mptcp/mptcp_ctrl.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.94/net/mptcp/mptcp_ctrl.c +--- linux-4.14.89/net/mptcp/mptcp_ctrl.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ctrl.c 2018-12-20 12:51:01.000000000 +0100 @@ -0,0 +1,2931 @@ +/* + * MPTCP implementation - MPTCP-control @@ -10859,9 +10856,9 @@ diff -aurN a/net/mptcp/mptcp_ctrl.c b/net/mptcp/mptcp_ctrl.c +mptcp_sock_cache_failed: + mptcp_init_failed = true; +} -diff -aurN a/net/mptcp/mptcp_fullmesh.c b/net/mptcp/mptcp_fullmesh.c ---- a/net/mptcp/mptcp_fullmesh.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/net/mptcp/mptcp_fullmesh.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/mptcp/mptcp_fullmesh.c mptcp-mptcp_v0.94/net/mptcp/mptcp_fullmesh.c +--- linux-4.14.89/net/mptcp/mptcp_fullmesh.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_fullmesh.c 2018-12-20 12:51:01.000000000 +0100 @@ -0,0 +1,2013 @@ +#include +#include @@ -12876,10 +12873,10 @@ diff -aurN a/net/mptcp/mptcp_fullmesh.c b/net/mptcp/mptcp_fullmesh.c +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Full-Mesh MPTCP"); +MODULE_VERSION("0.88"); -diff -aurN a/net/mptcp/mptcp_input.c b/net/mptcp/mptcp_input.c ---- a/net/mptcp/mptcp_input.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/net/mptcp/mptcp_input.c 2018-11-27 13:37:16.000000000 +0100 -@@ -0,0 +1,2465 @@ +diff -aurN linux-4.14.89/net/mptcp/mptcp_input.c mptcp-mptcp_v0.94/net/mptcp/mptcp_input.c +--- linux-4.14.89/net/mptcp/mptcp_input.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_input.c 2018-12-20 12:51:01.000000000 +0100 +@@ -0,0 +1,2466 @@ +/* + * MPTCP implementation - Sending side + * @@ -15207,6 +15204,7 @@ diff -aurN a/net/mptcp/mptcp_input.c b/net/mptcp/mptcp_input.c + sk_set_socket(sk, meta_sk->sk_socket); + sk->sk_wq = meta_sk->sk_wq; + ++ bh_unlock_sock(sk); + /* hold in sk_clone_lock due to initialization to 2 */ + sock_put(sk); + } else { @@ -15345,10 +15343,10 @@ diff -aurN a/net/mptcp/mptcp_input.c b/net/mptcp/mptcp_input.c + tcp_set_rto(sk); + mptcp_set_rto(sk); +} -diff -aurN a/net/mptcp/mptcp_ipv4.c b/net/mptcp/mptcp_ipv4.c ---- a/net/mptcp/mptcp_ipv4.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/net/mptcp/mptcp_ipv4.c 2018-11-27 13:37:16.000000000 +0100 -@@ -0,0 +1,437 @@ +diff -aurN linux-4.14.89/net/mptcp/mptcp_ipv4.c mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv4.c +--- linux-4.14.89/net/mptcp/mptcp_ipv4.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv4.c 2018-12-20 12:51:01.000000000 +0100 +@@ -0,0 +1,436 @@ +/* + * MPTCP implementation - IPv4-specific functions + * @@ -15553,7 +15551,6 @@ diff -aurN a/net/mptcp/mptcp_ipv4.c b/net/mptcp/mptcp_ipv4.c + goto reset_and_discard; + + local_bh_disable(); -+ + child = tcp_check_req(meta_sk, skb, req, false); + if (!child) { + reqsk_put(req); @@ -15786,9 +15783,9 @@ diff -aurN a/net/mptcp/mptcp_ipv4.c b/net/mptcp/mptcp_ipv4.c + kmem_cache_destroy(mptcp_request_sock_ops.slab); + kfree(mptcp_request_sock_ops.slab_name); +} -diff -aurN a/net/mptcp/mptcp_ipv6.c b/net/mptcp/mptcp_ipv6.c ---- a/net/mptcp/mptcp_ipv6.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/net/mptcp/mptcp_ipv6.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/mptcp/mptcp_ipv6.c mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv6.c +--- linux-4.14.89/net/mptcp/mptcp_ipv6.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv6.c 2018-12-20 12:51:01.000000000 +0100 @@ -0,0 +1,465 @@ +/* + * MPTCP implementation - IPv6-specific functions @@ -16255,9 +16252,9 @@ diff -aurN a/net/mptcp/mptcp_ipv6.c b/net/mptcp/mptcp_ipv6.c + kmem_cache_destroy(mptcp6_request_sock_ops.slab); + kfree(mptcp6_request_sock_ops.slab_name); +} -diff -aurN a/net/mptcp/mptcp_ndiffports.c b/net/mptcp/mptcp_ndiffports.c ---- a/net/mptcp/mptcp_ndiffports.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/net/mptcp/mptcp_ndiffports.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/mptcp/mptcp_ndiffports.c mptcp-mptcp_v0.94/net/mptcp/mptcp_ndiffports.c +--- linux-4.14.89/net/mptcp/mptcp_ndiffports.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ndiffports.c 2018-12-20 12:51:01.000000000 +0100 @@ -0,0 +1,169 @@ +#include + @@ -16428,9 +16425,9 @@ diff -aurN a/net/mptcp/mptcp_ndiffports.c b/net/mptcp/mptcp_ndiffports.c +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("NDIFF-PORTS MPTCP"); +MODULE_VERSION("0.88"); -diff -aurN a/net/mptcp/mptcp_olia.c b/net/mptcp/mptcp_olia.c ---- a/net/mptcp/mptcp_olia.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/net/mptcp/mptcp_olia.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/mptcp/mptcp_olia.c mptcp-mptcp_v0.94/net/mptcp/mptcp_olia.c +--- linux-4.14.89/net/mptcp/mptcp_olia.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_olia.c 2018-12-20 12:51:01.000000000 +0100 @@ -0,0 +1,310 @@ +/* + * MPTCP implementation - OPPORTUNISTIC LINKED INCREASES CONGESTION CONTROL: @@ -16742,9 +16739,9 @@ diff -aurN a/net/mptcp/mptcp_olia.c b/net/mptcp/mptcp_olia.c +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("MPTCP COUPLED CONGESTION CONTROL"); +MODULE_VERSION("0.1"); -diff -aurN a/net/mptcp/mptcp_output.c b/net/mptcp/mptcp_output.c ---- a/net/mptcp/mptcp_output.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/net/mptcp/mptcp_output.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/mptcp/mptcp_output.c mptcp-mptcp_v0.94/net/mptcp/mptcp_output.c +--- linux-4.14.89/net/mptcp/mptcp_output.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_output.c 2018-12-20 12:51:01.000000000 +0100 @@ -0,0 +1,1816 @@ +/* + * MPTCP implementation - Sending side @@ -18562,9 +18559,9 @@ diff -aurN a/net/mptcp/mptcp_output.c b/net/mptcp/mptcp_output.c + return max(xmit_size_goal, mss_now); +} + -diff -aurN a/net/mptcp/mptcp_pm.c b/net/mptcp/mptcp_pm.c ---- a/net/mptcp/mptcp_pm.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/net/mptcp/mptcp_pm.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/mptcp/mptcp_pm.c mptcp-mptcp_v0.94/net/mptcp/mptcp_pm.c +--- linux-4.14.89/net/mptcp/mptcp_pm.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_pm.c 2018-12-20 12:51:01.000000000 +0100 @@ -0,0 +1,226 @@ +/* + * MPTCP implementation - MPTCP-subflow-management @@ -18792,9 +18789,9 @@ diff -aurN a/net/mptcp/mptcp_pm.c b/net/mptcp/mptcp_pm.c + return mptcp_set_default_path_manager(CONFIG_DEFAULT_MPTCP_PM); +} +late_initcall(mptcp_path_manager_default); -diff -aurN a/net/mptcp/mptcp_redundant.c b/net/mptcp/mptcp_redundant.c ---- a/net/mptcp/mptcp_redundant.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/net/mptcp/mptcp_redundant.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/mptcp/mptcp_redundant.c mptcp-mptcp_v0.94/net/mptcp/mptcp_redundant.c +--- linux-4.14.89/net/mptcp/mptcp_redundant.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_redundant.c 2018-12-20 12:51:01.000000000 +0100 @@ -0,0 +1,301 @@ +/* + * MPTCP Scheduler to reduce latency and jitter. @@ -19097,9 +19094,9 @@ diff -aurN a/net/mptcp/mptcp_redundant.c b/net/mptcp/mptcp_redundant.c +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("REDUNDANT MPTCP"); +MODULE_VERSION("0.90"); -diff -aurN a/net/mptcp/mptcp_rr.c b/net/mptcp/mptcp_rr.c ---- a/net/mptcp/mptcp_rr.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/net/mptcp/mptcp_rr.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/mptcp/mptcp_rr.c mptcp-mptcp_v0.94/net/mptcp/mptcp_rr.c +--- linux-4.14.89/net/mptcp/mptcp_rr.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_rr.c 2018-12-20 12:51:01.000000000 +0100 @@ -0,0 +1,301 @@ +/* MPTCP Scheduler module selector. Highly inspired by tcp_cong.c */ + @@ -19402,9 +19399,9 @@ diff -aurN a/net/mptcp/mptcp_rr.c b/net/mptcp/mptcp_rr.c +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("ROUNDROBIN MPTCP"); +MODULE_VERSION("0.89"); -diff -aurN a/net/mptcp/mptcp_sched.c b/net/mptcp/mptcp_sched.c ---- a/net/mptcp/mptcp_sched.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/net/mptcp/mptcp_sched.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/mptcp/mptcp_sched.c mptcp-mptcp_v0.94/net/mptcp/mptcp_sched.c +--- linux-4.14.89/net/mptcp/mptcp_sched.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_sched.c 2018-12-20 12:51:01.000000000 +0100 @@ -0,0 +1,634 @@ +/* MPTCP Scheduler module selector. Highly inspired by tcp_cong.c */ + @@ -20040,9 +20037,9 @@ diff -aurN a/net/mptcp/mptcp_sched.c b/net/mptcp/mptcp_sched.c + return mptcp_set_default_scheduler(CONFIG_DEFAULT_MPTCP_SCHED); +} +late_initcall(mptcp_scheduler_default); -diff -aurN a/net/mptcp/mptcp_wvegas.c b/net/mptcp/mptcp_wvegas.c ---- a/net/mptcp/mptcp_wvegas.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/net/mptcp/mptcp_wvegas.c 2018-11-27 13:37:16.000000000 +0100 +diff -aurN linux-4.14.89/net/mptcp/mptcp_wvegas.c mptcp-mptcp_v0.94/net/mptcp/mptcp_wvegas.c +--- linux-4.14.89/net/mptcp/mptcp_wvegas.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.94/net/mptcp/mptcp_wvegas.c 2018-12-20 12:51:01.000000000 +0100 @@ -0,0 +1,270 @@ +/* + * MPTCP implementation - WEIGHTED VEGAS