diff --git a/root/target/linux/generic/config-4.19 b/root/target/linux/generic/config-4.19 index dab23da2..b4daeb57 100644 --- a/root/target/linux/generic/config-4.19 +++ b/root/target/linux/generic/config-4.19 @@ -284,6 +284,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8 # CONFIG_ARCNET is not set # CONFIG_ARC_EMAC is not set # CONFIG_ARC_IRQ_NO_AUTOSAVE is not set +# CONFIG_ARGON_MEM is not set # CONFIG_ARM64_ERRATUM_1024718 is not set # CONFIG_ARM64_ERRATUM_819472 is not set # CONFIG_ARM64_ERRATUM_824069 is not set diff --git a/root/target/linux/generic/hack-4.19/690-mptcp_v0.95.patch b/root/target/linux/generic/hack-4.19/690-mptcp_v0.95.patch index 2b3053af..fc090f66 100644 --- a/root/target/linux/generic/hack-4.19/690-mptcp_v0.95.patch +++ b/root/target/linux/generic/hack-4.19/690-mptcp_v0.95.patch @@ -1,6 +1,6 @@ -diff -aurN linux-4.19.53/Documentation/networking/ip-sysctl.txt mptcp-mptcp_v0.95/Documentation/networking/ip-sysctl.txt ---- linux-4.19.53/Documentation/networking/ip-sysctl.txt 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/Documentation/networking/ip-sysctl.txt 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/Documentation/networking/ip-sysctl.txt mptcp-mptcp_v0.95/Documentation/networking/ip-sysctl.txt +--- linux-4.19.55/Documentation/networking/ip-sysctl.txt 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/Documentation/networking/ip-sysctl.txt 2019-06-24 09:39:58.000000000 +0200 @@ -763,6 +763,18 @@ in RFC 5961 (Improving TCP's Robustness to Blind In-Window Attacks) Default: 100 @@ -20,9 +20,9 @@ diff -aurN linux-4.19.53/Documentation/networking/ip-sysctl.txt mptcp-mptcp_v0.9 UDP variables: udp_l3mdev_accept - BOOLEAN -diff -aurN linux-4.19.53/drivers/infiniband/hw/cxgb4/cm.c mptcp-mptcp_v0.95/drivers/infiniband/hw/cxgb4/cm.c ---- linux-4.19.53/drivers/infiniband/hw/cxgb4/cm.c 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/drivers/infiniband/hw/cxgb4/cm.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/drivers/infiniband/hw/cxgb4/cm.c mptcp-mptcp_v0.95/drivers/infiniband/hw/cxgb4/cm.c +--- linux-4.19.55/drivers/infiniband/hw/cxgb4/cm.c 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/drivers/infiniband/hw/cxgb4/cm.c 2019-06-24 09:39:58.000000000 +0200 @@ -3779,7 +3779,7 @@ */ memset(&tmp_opt, 0, sizeof(tmp_opt)); @@ -32,9 +32,9 @@ diff -aurN linux-4.19.53/drivers/infiniband/hw/cxgb4/cm.c mptcp-mptcp_v0.95/driv req = __skb_push(skb, sizeof(*req)); memset(req, 0, sizeof(*req)); -diff -aurN linux-4.19.53/include/linux/skbuff.h mptcp-mptcp_v0.95/include/linux/skbuff.h ---- linux-4.19.53/include/linux/skbuff.h 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/linux/skbuff.h 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/include/linux/skbuff.h mptcp-mptcp_v0.95/include/linux/skbuff.h +--- linux-4.19.55/include/linux/skbuff.h 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/include/linux/skbuff.h 2019-06-24 09:39:58.000000000 +0200 @@ -697,7 +697,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 linux-4.19.53/include/linux/skbuff.h mptcp-mptcp_v0.95/include/linux/ union { struct { -diff -aurN linux-4.19.53/include/linux/tcp.h mptcp-mptcp_v0.95/include/linux/tcp.h ---- linux-4.19.53/include/linux/tcp.h 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/linux/tcp.h 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/include/linux/tcp.h mptcp-mptcp_v0.95/include/linux/tcp.h +--- linux-4.19.55/include/linux/tcp.h 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/include/linux/tcp.h 2019-06-24 09:39:58.000000000 +0200 @@ -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 linux-4.19.53/include/linux/tcp.h mptcp-mptcp_v0.95/include/linux/tcp }; static inline struct tcp_timewait_sock *tcp_twsk(const struct sock *sk) -diff -aurN linux-4.19.53/include/net/inet_common.h mptcp-mptcp_v0.95/include/net/inet_common.h ---- linux-4.19.53/include/net/inet_common.h 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/net/inet_common.h 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/include/net/inet_common.h mptcp-mptcp_v0.95/include/net/inet_common.h +--- linux-4.19.55/include/net/inet_common.h 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/include/net/inet_common.h 2019-06-24 09:39:58.000000000 +0200 @@ -2,6 +2,8 @@ #ifndef _INET_COMMON_H #define _INET_COMMON_H @@ -224,9 +224,9 @@ diff -aurN linux-4.19.53/include/net/inet_common.h mptcp-mptcp_v0.95/include/net int inet_release(struct socket *sock); int inet_stream_connect(struct socket *sock, struct sockaddr *uaddr, int addr_len, int flags); -diff -aurN linux-4.19.53/include/net/inet_connection_sock.h mptcp-mptcp_v0.95/include/net/inet_connection_sock.h ---- linux-4.19.53/include/net/inet_connection_sock.h 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/net/inet_connection_sock.h 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/include/net/inet_connection_sock.h mptcp-mptcp_v0.95/include/net/inet_connection_sock.h +--- linux-4.19.55/include/net/inet_connection_sock.h 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/include/net/inet_connection_sock.h 2019-06-24 09:39:58.000000000 +0200 @@ -29,6 +29,7 @@ struct inet_bind_bucket; @@ -235,9 +235,9 @@ diff -aurN linux-4.19.53/include/net/inet_connection_sock.h mptcp-mptcp_v0.95/in /* * Pointers to address related TCP functions -diff -aurN linux-4.19.53/include/net/inet_sock.h mptcp-mptcp_v0.95/include/net/inet_sock.h ---- linux-4.19.53/include/net/inet_sock.h 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/net/inet_sock.h 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/include/net/inet_sock.h mptcp-mptcp_v0.95/include/net/inet_sock.h +--- linux-4.19.55/include/net/inet_sock.h 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/include/net/inet_sock.h 2019-06-24 09:39:58.000000000 +0200 @@ -83,7 +83,7 @@ #define ireq_state req.__req_common.skc_state #define ireq_family req.__req_common.skc_family @@ -256,9 +256,9 @@ diff -aurN linux-4.19.53/include/net/inet_sock.h mptcp-mptcp_v0.95/include/net/i smc_ok : 1; u32 ir_mark; union { -diff -aurN linux-4.19.53/include/net/mptcp.h mptcp-mptcp_v0.95/include/net/mptcp.h ---- linux-4.19.53/include/net/mptcp.h 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/include/net/mptcp.h 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/include/net/mptcp.h mptcp-mptcp_v0.95/include/net/mptcp.h +--- linux-4.19.55/include/net/mptcp.h 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/net/mptcp.h 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,1491 @@ +/* + * MPTCP implementation @@ -1751,9 +1751,9 @@ diff -aurN linux-4.19.53/include/net/mptcp.h mptcp-mptcp_v0.95/include/net/mptcp +#endif /* CONFIG_MPTCP */ + +#endif /* _MPTCP_H */ -diff -aurN linux-4.19.53/include/net/mptcp_v4.h mptcp-mptcp_v0.95/include/net/mptcp_v4.h ---- linux-4.19.53/include/net/mptcp_v4.h 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/include/net/mptcp_v4.h 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/include/net/mptcp_v4.h mptcp-mptcp_v0.95/include/net/mptcp_v4.h +--- linux-4.19.55/include/net/mptcp_v4.h 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/net/mptcp_v4.h 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,76 @@ +/* + * MPTCP implementation @@ -1831,9 +1831,9 @@ diff -aurN linux-4.19.53/include/net/mptcp_v4.h mptcp-mptcp_v0.95/include/net/mp +#endif /* CONFIG_MPTCP */ + +#endif /* MPTCP_V4_H_ */ -diff -aurN linux-4.19.53/include/net/mptcp_v6.h mptcp-mptcp_v0.95/include/net/mptcp_v6.h ---- linux-4.19.53/include/net/mptcp_v6.h 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/include/net/mptcp_v6.h 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/include/net/mptcp_v6.h mptcp-mptcp_v0.95/include/net/mptcp_v6.h +--- linux-4.19.55/include/net/mptcp_v6.h 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/net/mptcp_v6.h 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,77 @@ +/* + * MPTCP implementation @@ -1912,9 +1912,9 @@ diff -aurN linux-4.19.53/include/net/mptcp_v6.h mptcp-mptcp_v0.95/include/net/mp +#endif /* CONFIG_MPTCP */ + +#endif /* _MPTCP_V6_H */ -diff -aurN linux-4.19.53/include/net/net_namespace.h mptcp-mptcp_v0.95/include/net/net_namespace.h ---- linux-4.19.53/include/net/net_namespace.h 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/net/net_namespace.h 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/include/net/net_namespace.h mptcp-mptcp_v0.95/include/net/net_namespace.h +--- linux-4.19.55/include/net/net_namespace.h 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/include/net/net_namespace.h 2019-06-24 09:39:58.000000000 +0200 @@ -19,6 +19,7 @@ #include #include @@ -1933,9 +1933,9 @@ diff -aurN linux-4.19.53/include/net/net_namespace.h mptcp-mptcp_v0.95/include/n #if IS_ENABLED(CONFIG_IEEE802154_6LOWPAN) struct netns_ieee802154_lowpan ieee802154_lowpan; #endif -diff -aurN linux-4.19.53/include/net/netns/mptcp.h mptcp-mptcp_v0.95/include/net/netns/mptcp.h ---- linux-4.19.53/include/net/netns/mptcp.h 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/include/net/netns/mptcp.h 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/include/net/netns/mptcp.h mptcp-mptcp_v0.95/include/net/netns/mptcp.h +--- linux-4.19.55/include/net/netns/mptcp.h 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/net/netns/mptcp.h 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,52 @@ +/* + * MPTCP implementation - MPTCP namespace @@ -1989,9 +1989,9 @@ diff -aurN linux-4.19.53/include/net/netns/mptcp.h mptcp-mptcp_v0.95/include/net +}; + +#endif /* __NETNS_MPTCP_H__ */ -diff -aurN linux-4.19.53/include/net/snmp.h mptcp-mptcp_v0.95/include/net/snmp.h ---- linux-4.19.53/include/net/snmp.h 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/net/snmp.h 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/include/net/snmp.h mptcp-mptcp_v0.95/include/net/snmp.h +--- linux-4.19.55/include/net/snmp.h 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/include/net/snmp.h 2019-06-24 09:39:58.000000000 +0200 @@ -91,7 +91,6 @@ atomic_long_t mibs[ICMP6MSG_MIB_MAX]; }; @@ -2000,9 +2000,9 @@ diff -aurN linux-4.19.53/include/net/snmp.h mptcp-mptcp_v0.95/include/net/snmp.h /* TCP */ #define TCP_MIB_MAX __TCP_MIB_MAX struct tcp_mib { -diff -aurN linux-4.19.53/include/net/sock.h mptcp-mptcp_v0.95/include/net/sock.h ---- linux-4.19.53/include/net/sock.h 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/net/sock.h 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/include/net/sock.h mptcp-mptcp_v0.95/include/net/sock.h +--- linux-4.19.55/include/net/sock.h 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/include/net/sock.h 2019-06-24 09:39:58.000000000 +0200 @@ -810,6 +810,7 @@ SOCK_SELECT_ERR_QUEUE, /* Wake select on error queue */ SOCK_RCU_FREE, /* wait rcu grace period in sk_destruct() */ @@ -2019,9 +2019,9 @@ diff -aurN linux-4.19.53/include/net/sock.h mptcp-mptcp_v0.95/include/net/sock.h /* Keeping track of sockets in use */ #ifdef CONFIG_PROC_FS -diff -aurN linux-4.19.53/include/net/tcp.h mptcp-mptcp_v0.95/include/net/tcp.h ---- linux-4.19.53/include/net/tcp.h 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/net/tcp.h 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/include/net/tcp.h mptcp-mptcp_v0.95/include/net/tcp.h +--- linux-4.19.55/include/net/tcp.h 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/include/net/tcp.h 2019-06-24 09:39:58.000000000 +0200 @@ -185,6 +185,7 @@ #define TCPOPT_SACK 5 /* SACK Block */ #define TCPOPT_TIMESTAMP 8 /* Better RTT estimations/PAWS */ @@ -2341,9 +2341,9 @@ diff -aurN linux-4.19.53/include/net/tcp.h mptcp-mptcp_v0.95/include/net/tcp.h const struct sock *sk, struct sk_buff *skb, __u16 *mss) { -diff -aurN linux-4.19.53/include/net/tcp_states.h mptcp-mptcp_v0.95/include/net/tcp_states.h ---- linux-4.19.53/include/net/tcp_states.h 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/net/tcp_states.h 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/include/net/tcp_states.h mptcp-mptcp_v0.95/include/net/tcp_states.h +--- linux-4.19.55/include/net/tcp_states.h 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/include/net/tcp_states.h 2019-06-24 09:39:58.000000000 +0200 @@ -26,6 +26,7 @@ TCP_LISTEN, TCP_CLOSING, /* Now a valid state */ @@ -2360,9 +2360,9 @@ diff -aurN linux-4.19.53/include/net/tcp_states.h mptcp-mptcp_v0.95/include/net/ }; #endif /* _LINUX_TCP_STATES_H */ -diff -aurN linux-4.19.53/include/net/transp_v6.h mptcp-mptcp_v0.95/include/net/transp_v6.h ---- linux-4.19.53/include/net/transp_v6.h 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/net/transp_v6.h 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/include/net/transp_v6.h mptcp-mptcp_v0.95/include/net/transp_v6.h +--- linux-4.19.55/include/net/transp_v6.h 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/include/net/transp_v6.h 2019-06-24 09:39:58.000000000 +0200 @@ -58,6 +58,8 @@ /* address family specific functions */ @@ -2372,9 +2372,9 @@ diff -aurN linux-4.19.53/include/net/transp_v6.h mptcp-mptcp_v0.95/include/net/t void inet6_destroy_sock(struct sock *sk); -diff -aurN linux-4.19.53/include/trace/events/tcp.h mptcp-mptcp_v0.95/include/trace/events/tcp.h ---- linux-4.19.53/include/trace/events/tcp.h 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/trace/events/tcp.h 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/include/trace/events/tcp.h mptcp-mptcp_v0.95/include/trace/events/tcp.h +--- linux-4.19.55/include/trace/events/tcp.h 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/include/trace/events/tcp.h 2019-06-24 09:39:58.000000000 +0200 @@ -10,6 +10,7 @@ #include #include @@ -2423,9 +2423,9 @@ diff -aurN linux-4.19.53/include/trace/events/tcp.h mptcp-mptcp_v0.95/include/tr ); #endif /* _TRACE_TCP_H */ -diff -aurN linux-4.19.53/include/uapi/linux/bpf.h mptcp-mptcp_v0.95/include/uapi/linux/bpf.h ---- linux-4.19.53/include/uapi/linux/bpf.h 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/uapi/linux/bpf.h 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/include/uapi/linux/bpf.h mptcp-mptcp_v0.95/include/uapi/linux/bpf.h +--- linux-4.19.55/include/uapi/linux/bpf.h 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/include/uapi/linux/bpf.h 2019-06-24 09:39:58.000000000 +0200 @@ -2671,6 +2671,7 @@ BPF_TCP_LISTEN, BPF_TCP_CLOSING, /* Now a valid state */ @@ -2434,9 +2434,9 @@ diff -aurN linux-4.19.53/include/uapi/linux/bpf.h mptcp-mptcp_v0.95/include/uapi BPF_TCP_MAX_STATES /* Leave at the end! */ }; -diff -aurN linux-4.19.53/include/uapi/linux/if.h mptcp-mptcp_v0.95/include/uapi/linux/if.h ---- linux-4.19.53/include/uapi/linux/if.h 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/uapi/linux/if.h 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/include/uapi/linux/if.h mptcp-mptcp_v0.95/include/uapi/linux/if.h +--- linux-4.19.55/include/uapi/linux/if.h 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/include/uapi/linux/if.h 2019-06-24 09:39:58.000000000 +0200 @@ -132,6 +132,9 @@ #define IFF_ECHO IFF_ECHO #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ @@ -2447,9 +2447,9 @@ diff -aurN linux-4.19.53/include/uapi/linux/if.h mptcp-mptcp_v0.95/include/uapi/ #define IFF_VOLATILE (IFF_LOOPBACK|IFF_POINTOPOINT|IFF_BROADCAST|IFF_ECHO|\ IFF_MASTER|IFF_SLAVE|IFF_RUNNING|IFF_LOWER_UP|IFF_DORMANT) -diff -aurN linux-4.19.53/include/uapi/linux/mptcp.h mptcp-mptcp_v0.95/include/uapi/linux/mptcp.h ---- linux-4.19.53/include/uapi/linux/mptcp.h 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/include/uapi/linux/mptcp.h 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/include/uapi/linux/mptcp.h mptcp-mptcp_v0.95/include/uapi/linux/mptcp.h +--- linux-4.19.55/include/uapi/linux/mptcp.h 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/include/uapi/linux/mptcp.h 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,149 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* @@ -2600,9 +2600,9 @@ diff -aurN linux-4.19.53/include/uapi/linux/mptcp.h mptcp-mptcp_v0.95/include/ua +}; + +#endif /* _LINUX_MPTCP_H */ -diff -aurN linux-4.19.53/include/uapi/linux/tcp.h mptcp-mptcp_v0.95/include/uapi/linux/tcp.h ---- linux-4.19.53/include/uapi/linux/tcp.h 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/include/uapi/linux/tcp.h 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/include/uapi/linux/tcp.h mptcp-mptcp_v0.95/include/uapi/linux/tcp.h +--- linux-4.19.55/include/uapi/linux/tcp.h 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/include/uapi/linux/tcp.h 2019-06-24 09:39:58.000000000 +0200 @@ -18,9 +18,15 @@ #ifndef _UAPI_LINUX_TCP_H #define _UAPI_LINUX_TCP_H @@ -2688,9 +2688,9 @@ diff -aurN linux-4.19.53/include/uapi/linux/tcp.h mptcp-mptcp_v0.95/include/uapi /* for TCP_MD5SIG socket option */ #define TCP_MD5SIG_MAXKEYLEN 80 -diff -aurN linux-4.19.53/net/core/dev.c mptcp-mptcp_v0.95/net/core/dev.c ---- linux-4.19.53/net/core/dev.c 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/core/dev.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/core/dev.c mptcp-mptcp_v0.95/net/core/dev.c +--- linux-4.19.55/net/core/dev.c 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/net/core/dev.c 2019-06-24 09:39:58.000000000 +0200 @@ -7471,7 +7471,7 @@ dev->flags = (flags & (IFF_DEBUG | IFF_NOTRAILERS | IFF_NOARP | @@ -2700,9 +2700,9 @@ diff -aurN linux-4.19.53/net/core/dev.c mptcp-mptcp_v0.95/net/core/dev.c (dev->flags & (IFF_UP | IFF_VOLATILE | IFF_PROMISC | IFF_ALLMULTI)); -diff -aurN linux-4.19.53/net/core/skbuff.c mptcp-mptcp_v0.95/net/core/skbuff.c ---- linux-4.19.53/net/core/skbuff.c 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/core/skbuff.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/core/skbuff.c mptcp-mptcp_v0.95/net/core/skbuff.c +--- linux-4.19.55/net/core/skbuff.c 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/net/core/skbuff.c 2019-06-24 09:39:58.000000000 +0200 @@ -536,7 +536,7 @@ skb_drop_list(&skb_shinfo(skb)->frag_list); } @@ -2712,9 +2712,9 @@ diff -aurN linux-4.19.53/net/core/skbuff.c mptcp-mptcp_v0.95/net/core/skbuff.c { struct sk_buff *list; -diff -aurN linux-4.19.53/net/core/sock.c mptcp-mptcp_v0.95/net/core/sock.c ---- linux-4.19.53/net/core/sock.c 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/core/sock.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/core/sock.c mptcp-mptcp_v0.95/net/core/sock.c +--- linux-4.19.55/net/core/sock.c 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/net/core/sock.c 2019-06-24 09:39:58.000000000 +0200 @@ -140,6 +140,11 @@ #include @@ -2774,9 +2774,9 @@ diff -aurN linux-4.19.53/net/core/sock.c mptcp-mptcp_v0.95/net/core/sock.c mem_cgroup_sk_alloc(newsk); cgroup_sk_alloc(&newsk->sk_cgrp_data); -diff -aurN linux-4.19.53/net/ipv4/af_inet.c mptcp-mptcp_v0.95/net/ipv4/af_inet.c ---- linux-4.19.53/net/ipv4/af_inet.c 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/af_inet.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/ipv4/af_inet.c mptcp-mptcp_v0.95/net/ipv4/af_inet.c +--- linux-4.19.55/net/ipv4/af_inet.c 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/net/ipv4/af_inet.c 2019-06-24 09:39:58.000000000 +0200 @@ -104,6 +104,7 @@ #include #include @@ -2840,9 +2840,9 @@ diff -aurN linux-4.19.53/net/ipv4/af_inet.c mptcp-mptcp_v0.95/net/ipv4/af_inet.c /* Setup TCP slab cache for open requests. */ tcp_init(); -diff -aurN linux-4.19.53/net/ipv4/inet_connection_sock.c mptcp-mptcp_v0.95/net/ipv4/inet_connection_sock.c ---- linux-4.19.53/net/ipv4/inet_connection_sock.c 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/inet_connection_sock.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/ipv4/inet_connection_sock.c mptcp-mptcp_v0.95/net/ipv4/inet_connection_sock.c +--- linux-4.19.55/net/ipv4/inet_connection_sock.c 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/net/ipv4/inet_connection_sock.c 2019-06-24 09:39:58.000000000 +0200 @@ -23,6 +23,7 @@ #include #include @@ -2900,9 +2900,9 @@ diff -aurN linux-4.19.53/net/ipv4/inet_connection_sock.c mptcp-mptcp_v0.95/net/i sock_put(child); cond_resched(); -diff -aurN linux-4.19.53/net/ipv4/ip_sockglue.c mptcp-mptcp_v0.95/net/ipv4/ip_sockglue.c ---- linux-4.19.53/net/ipv4/ip_sockglue.c 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/ip_sockglue.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/ipv4/ip_sockglue.c mptcp-mptcp_v0.95/net/ipv4/ip_sockglue.c +--- linux-4.19.55/net/ipv4/ip_sockglue.c 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/net/ipv4/ip_sockglue.c 2019-06-24 09:39:58.000000000 +0200 @@ -44,6 +44,8 @@ #endif #include @@ -2942,9 +2942,9 @@ diff -aurN linux-4.19.53/net/ipv4/ip_sockglue.c mptcp-mptcp_v0.95/net/ipv4/ip_so } break; case IP_TTL: -diff -aurN linux-4.19.53/net/ipv4/Kconfig mptcp-mptcp_v0.95/net/ipv4/Kconfig ---- linux-4.19.53/net/ipv4/Kconfig 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/Kconfig 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/ipv4/Kconfig mptcp-mptcp_v0.95/net/ipv4/Kconfig +--- linux-4.19.55/net/ipv4/Kconfig 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/net/ipv4/Kconfig 2019-06-24 09:39:58.000000000 +0200 @@ -680,6 +680,51 @@ bufferbloat, policers, or AQM schemes that do not provide a delay signal. It requires the fq ("Fair Queue") pacing packet scheduler. @@ -3030,9 +3030,9 @@ diff -aurN linux-4.19.53/net/ipv4/Kconfig mptcp-mptcp_v0.95/net/ipv4/Kconfig default "reno" if DEFAULT_RENO default "dctcp" if DEFAULT_DCTCP default "cdg" if DEFAULT_CDG -diff -aurN linux-4.19.53/net/ipv4/syncookies.c mptcp-mptcp_v0.95/net/ipv4/syncookies.c ---- linux-4.19.53/net/ipv4/syncookies.c 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/syncookies.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/ipv4/syncookies.c mptcp-mptcp_v0.95/net/ipv4/syncookies.c +--- linux-4.19.55/net/ipv4/syncookies.c 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/net/ipv4/syncookies.c 2019-06-24 09:39:58.000000000 +0200 @@ -16,6 +16,8 @@ #include #include @@ -3146,9 +3146,9 @@ diff -aurN linux-4.19.53/net/ipv4/syncookies.c mptcp-mptcp_v0.95/net/ipv4/syncoo ireq->rcv_wscale = rcv_wscale; ireq->ecn_ok = cookie_ecn_ok(&tcp_opt, sock_net(sk), &rt->dst); -diff -aurN linux-4.19.53/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c ---- linux-4.19.53/net/ipv4/tcp.c 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/tcp.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c +--- linux-4.19.55/net/ipv4/tcp.c 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/net/ipv4/tcp.c 2019-06-24 09:39:58.000000000 +0200 @@ -274,6 +274,7 @@ #include @@ -3853,9 +3853,9 @@ diff -aurN linux-4.19.53/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c return 0; } EXPORT_SYMBOL_GPL(tcp_abort); -diff -aurN linux-4.19.53/net/ipv4/tcp_diag.c mptcp-mptcp_v0.95/net/ipv4/tcp_diag.c ---- linux-4.19.53/net/ipv4/tcp_diag.c 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/tcp_diag.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/ipv4/tcp_diag.c mptcp-mptcp_v0.95/net/ipv4/tcp_diag.c +--- linux-4.19.55/net/ipv4/tcp_diag.c 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/net/ipv4/tcp_diag.c 2019-06-24 09:39:58.000000000 +0200 @@ -34,7 +34,7 @@ r->idiag_wqueue = tp->write_seq - tp->snd_una; } @@ -3865,9 +3865,9 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_diag.c mptcp-mptcp_v0.95/net/ipv4/tcp_diag } #ifdef CONFIG_TCP_MD5SIG -diff -aurN linux-4.19.53/net/ipv4/tcp_fastopen.c mptcp-mptcp_v0.95/net/ipv4/tcp_fastopen.c ---- linux-4.19.53/net/ipv4/tcp_fastopen.c 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/tcp_fastopen.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/ipv4/tcp_fastopen.c mptcp-mptcp_v0.95/net/ipv4/tcp_fastopen.c +--- linux-4.19.55/net/ipv4/tcp_fastopen.c 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/net/ipv4/tcp_fastopen.c 2019-06-24 09:39:58.000000000 +0200 @@ -9,6 +9,7 @@ #include #include @@ -3917,9 +3917,9 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_fastopen.c mptcp-mptcp_v0.95/net/ipv4/tcp_ /* tcp_conn_request() is sending the SYNACK, * and queues the child into listener accept queue. */ -diff -aurN linux-4.19.53/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_input.c ---- linux-4.19.53/net/ipv4/tcp_input.c 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/tcp_input.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_input.c +--- linux-4.19.55/net/ipv4/tcp_input.c 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/net/ipv4/tcp_input.c 2019-06-24 09:39:58.000000000 +0200 @@ -76,35 +76,15 @@ #include #include @@ -4781,9 +4781,9 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp sock_put(fastopen_sk); } else { tcp_rsk(req)->tfo_listener = false; -diff -aurN linux-4.19.53/net/ipv4/tcp_ipv4.c mptcp-mptcp_v0.95/net/ipv4/tcp_ipv4.c ---- linux-4.19.53/net/ipv4/tcp_ipv4.c 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/tcp_ipv4.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/ipv4/tcp_ipv4.c mptcp-mptcp_v0.95/net/ipv4/tcp_ipv4.c +--- linux-4.19.55/net/ipv4/tcp_ipv4.c 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/net/ipv4/tcp_ipv4.c 2019-06-24 09:39:58.000000000 +0200 @@ -67,6 +67,8 @@ #include #include @@ -5230,9 +5230,9 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_ipv4.c mptcp-mptcp_v0.95/net/ipv4/tcp_ipv4 }; EXPORT_SYMBOL(tcp_prot); -diff -aurN linux-4.19.53/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.95/net/ipv4/tcp_minisocks.c ---- linux-4.19.53/net/ipv4/tcp_minisocks.c 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/tcp_minisocks.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.95/net/ipv4/tcp_minisocks.c +--- linux-4.19.55/net/ipv4/tcp_minisocks.c 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/net/ipv4/tcp_minisocks.c 2019-06-24 09:39:58.000000000 +0200 @@ -18,11 +18,13 @@ * Jorge Cwik, */ @@ -5451,9 +5451,9 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.95/net/ipv4/tcp sock_put(child); return ret; } -diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_output.c ---- linux-4.19.53/net/ipv4/tcp_output.c 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/tcp_output.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_output.c +--- linux-4.19.55/net/ipv4/tcp_output.c 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/net/ipv4/tcp_output.c 2019-06-24 09:39:58.000000000 +0200 @@ -36,6 +36,12 @@ #define pr_fmt(fmt) "TCP: " fmt @@ -5754,7 +5754,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { struct tcp_sock *tp = tcp_sk(sk); -@@ -1369,7 +1405,7 @@ +@@ -1370,7 +1406,7 @@ /* This is similar to __pskb_pull_tail(). The difference is that pulled * data is not copied, but immediately discarded. */ @@ -5763,7 +5763,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { struct skb_shared_info *shinfo; int i, k, eat; -@@ -1591,6 +1627,7 @@ +@@ -1592,6 +1628,7 @@ return mss_now; } @@ -5771,7 +5771,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou /* RFC2861, slow part. Adjust cwnd, after it was not full during one rto. * As additional protections, we do not touch cwnd in retransmission phases, -@@ -1614,7 +1651,7 @@ +@@ -1615,7 +1652,7 @@ tp->snd_cwnd_stamp = tcp_jiffies32; } @@ -5780,7 +5780,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { const struct tcp_congestion_ops *ca_ops = inet_csk(sk)->icsk_ca_ops; struct tcp_sock *tp = tcp_sk(sk); -@@ -1672,8 +1709,8 @@ +@@ -1673,8 +1710,8 @@ * But we can avoid doing the divide again given we already have * skb_pcount = skb->len / mss_now */ @@ -5791,7 +5791,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { if (skb->len < tcp_skb_pcount(skb) * mss_now) tp->snd_sml = TCP_SKB_CB(skb)->end_seq; -@@ -1732,11 +1769,11 @@ +@@ -1733,11 +1770,11 @@ } /* Returns the portion of skb which can be sent right away */ @@ -5808,7 +5808,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { const struct tcp_sock *tp = tcp_sk(sk); u32 partial, needed, window, max_len; -@@ -1766,13 +1803,14 @@ +@@ -1767,13 +1804,14 @@ /* Can at least one segment of SKB be sent right now, according to the * congestion window rules? If so, return how many segments are allowed. */ @@ -5826,7 +5826,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou tcp_skb_pcount(skb) == 1) return 1; -@@ -1787,12 +1825,13 @@ +@@ -1788,12 +1826,13 @@ halfcwnd = max(cwnd >> 1, 1U); return min(halfcwnd, cwnd - in_flight); } @@ -5841,7 +5841,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { int tso_segs = tcp_skb_pcount(skb); -@@ -1807,8 +1846,8 @@ +@@ -1808,8 +1847,8 @@ /* Return true if the Nagle test allows this packet to be * sent now. */ @@ -5852,7 +5852,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { /* Nagle rule does not apply to frames, which sit in the middle of the * write_queue (they have no chances to get new data). -@@ -1820,7 +1859,8 @@ +@@ -1821,7 +1860,8 @@ return true; /* Don't use the nagle rule for urgent data (or for the final FIN). */ @@ -5862,7 +5862,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou return true; if (!tcp_nagle_check(skb->len < cur_mss, tp, nonagle)) -@@ -1830,9 +1870,8 @@ +@@ -1831,9 +1871,8 @@ } /* Does at least the first segment of SKB fit into the send window? */ @@ -5874,7 +5874,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { u32 end_seq = TCP_SKB_CB(skb)->end_seq; -@@ -1841,6 +1880,7 @@ +@@ -1842,6 +1881,7 @@ return !after(end_seq, tcp_wnd_end(tp)); } @@ -5882,7 +5882,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou /* Trim TSO SKB to LEN bytes, put the remaining data into a new packet * which is put after SKB on the list. It is very much like -@@ -1993,7 +2033,7 @@ +@@ -1994,7 +2034,7 @@ } /* If this packet won't get more data, do not wait. */ @@ -5891,7 +5891,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou goto send_now; return true; -@@ -2296,7 +2336,7 @@ +@@ -2297,7 +2337,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. */ @@ -5900,7 +5900,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou int push_one, gfp_t gfp) { struct tcp_sock *tp = tcp_sk(sk); -@@ -2310,7 +2350,12 @@ +@@ -2311,7 +2351,12 @@ sent_pkts = 0; tcp_mstamp_refresh(tp); @@ -5914,7 +5914,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou /* Do MTU probing. */ result = tcp_mtu_probe(sk); if (!result) { -@@ -2407,7 +2452,8 @@ +@@ -2408,7 +2453,8 @@ if (push_one != 2) tcp_schedule_loss_probe(sk, false); is_cwnd_limited |= (tcp_packets_in_flight(tp) >= tp->snd_cwnd); @@ -5924,7 +5924,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou return false; } return !tp->packets_out && !tcp_write_queue_empty(sk); -@@ -2490,7 +2536,7 @@ +@@ -2491,7 +2537,7 @@ skb = tcp_send_head(sk); if (skb && tcp_snd_wnd_test(tp, skb, mss)) { pcount = tp->packets_out; @@ -5933,7 +5933,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou if (tp->packets_out > pcount) goto probe_sent; goto rearm_timer; -@@ -2554,8 +2600,8 @@ +@@ -2555,8 +2601,8 @@ if (unlikely(sk->sk_state == TCP_CLOSE)) return; @@ -5944,7 +5944,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou tcp_check_probe_timer(sk); } -@@ -2568,7 +2614,8 @@ +@@ -2569,7 +2615,8 @@ BUG_ON(!skb || skb->len < mss_now); @@ -5954,7 +5954,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou } /* This function returns the amount that we can raise the -@@ -2790,6 +2837,10 @@ +@@ -2791,6 +2838,10 @@ if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_SYN) return; @@ -5965,7 +5965,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou skb_rbtree_walk_from_safe(skb, tmp) { if (!tcp_can_collapse(sk, skb)) break; -@@ -3259,7 +3310,7 @@ +@@ -3260,7 +3311,7 @@ /* RFC1323: The window in SYN & SYN/ACK segments is never scaled. */ th->window = htons(min(req->rsk_rcv_wnd, 65535U)); @@ -5974,7 +5974,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou th->doff = (tcp_header_size >> 2); __TCP_INC_STATS(sock_net(sk), TCP_MIB_OUTSEGS); -@@ -3340,13 +3391,13 @@ +@@ -3341,13 +3392,13 @@ if (rcv_wnd == 0) rcv_wnd = dst_metric(dst, RTAX_INITRWND); @@ -5995,7 +5995,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou tp->rx_opt.rcv_wscale = rcv_wscale; tp->rcv_ssthresh = tp->rcv_wnd; -@@ -3371,6 +3422,36 @@ +@@ -3372,6 +3423,36 @@ inet_csk(sk)->icsk_rto = tcp_timeout_init(sk); inet_csk(sk)->icsk_retransmits = 0; tcp_clear_retrans(tp); @@ -6032,7 +6032,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou } static void tcp_connect_queue_skb(struct sock *sk, struct sk_buff *skb) -@@ -3633,6 +3714,7 @@ +@@ -3634,6 +3715,7 @@ { __tcp_send_ack(sk, tcp_sk(sk)->rcv_nxt); } @@ -6040,7 +6040,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou /* This routine sends a packet with an out of date sequence * number. It assumes the other end will try to ack it. -@@ -3645,7 +3727,7 @@ +@@ -3646,7 +3728,7 @@ * one is with SEG.SEQ=SND.UNA to deliver urgent pointer, another is * out-of-date with SND.UNA-1 to probe window. */ @@ -6049,7 +6049,7 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou { struct tcp_sock *tp = tcp_sk(sk); struct sk_buff *skb; -@@ -3732,7 +3814,7 @@ +@@ -3733,7 +3815,7 @@ unsigned long probe_max; int err; @@ -6058,9 +6058,9 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou if (tp->packets_out || tcp_write_queue_empty(sk)) { /* Cancel probe timer, if it is not required. */ -diff -aurN linux-4.19.53/net/ipv4/tcp_timer.c mptcp-mptcp_v0.95/net/ipv4/tcp_timer.c ---- linux-4.19.53/net/ipv4/tcp_timer.c 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv4/tcp_timer.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/ipv4/tcp_timer.c mptcp-mptcp_v0.95/net/ipv4/tcp_timer.c +--- linux-4.19.55/net/ipv4/tcp_timer.c 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/net/ipv4/tcp_timer.c 2019-06-24 09:39:58.000000000 +0200 @@ -20,6 +20,7 @@ #include @@ -6258,9 +6258,9 @@ diff -aurN linux-4.19.53/net/ipv4/tcp_timer.c mptcp-mptcp_v0.95/net/ipv4/tcp_tim sock_put(sk); } -diff -aurN linux-4.19.53/net/ipv6/addrconf.c mptcp-mptcp_v0.95/net/ipv6/addrconf.c ---- linux-4.19.53/net/ipv6/addrconf.c 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv6/addrconf.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/ipv6/addrconf.c mptcp-mptcp_v0.95/net/ipv6/addrconf.c +--- linux-4.19.55/net/ipv6/addrconf.c 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/net/ipv6/addrconf.c 2019-06-24 09:39:58.000000000 +0200 @@ -917,6 +917,7 @@ kfree_rcu(ifp, rcu); @@ -6269,9 +6269,9 @@ diff -aurN linux-4.19.53/net/ipv6/addrconf.c mptcp-mptcp_v0.95/net/ipv6/addrconf static void ipv6_link_dev_addr(struct inet6_dev *idev, struct inet6_ifaddr *ifp) -diff -aurN linux-4.19.53/net/ipv6/af_inet6.c mptcp-mptcp_v0.95/net/ipv6/af_inet6.c ---- linux-4.19.53/net/ipv6/af_inet6.c 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv6/af_inet6.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/ipv6/af_inet6.c mptcp-mptcp_v0.95/net/ipv6/af_inet6.c +--- linux-4.19.55/net/ipv6/af_inet6.c 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/net/ipv6/af_inet6.c 2019-06-24 09:39:58.000000000 +0200 @@ -107,8 +107,7 @@ return (struct ipv6_pinfo *)(((u8 *)sk) + offset); } @@ -6282,9 +6282,9 @@ diff -aurN linux-4.19.53/net/ipv6/af_inet6.c mptcp-mptcp_v0.95/net/ipv6/af_inet6 { struct inet_sock *inet; struct ipv6_pinfo *np; -diff -aurN linux-4.19.53/net/ipv6/ipv6_sockglue.c mptcp-mptcp_v0.95/net/ipv6/ipv6_sockglue.c ---- linux-4.19.53/net/ipv6/ipv6_sockglue.c 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv6/ipv6_sockglue.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/ipv6/ipv6_sockglue.c mptcp-mptcp_v0.95/net/ipv6/ipv6_sockglue.c +--- linux-4.19.55/net/ipv6/ipv6_sockglue.c 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/net/ipv6/ipv6_sockglue.c 2019-06-24 09:39:58.000000000 +0200 @@ -48,6 +48,8 @@ #include #include @@ -6308,9 +6308,9 @@ diff -aurN linux-4.19.53/net/ipv6/ipv6_sockglue.c mptcp-mptcp_v0.95/net/ipv6/ipv sk->sk_socket->ops = &inet_stream_ops; sk->sk_family = PF_INET; tcp_sync_mss(sk, icsk->icsk_pmtu_cookie); -diff -aurN linux-4.19.53/net/ipv6/syncookies.c mptcp-mptcp_v0.95/net/ipv6/syncookies.c ---- linux-4.19.53/net/ipv6/syncookies.c 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv6/syncookies.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/ipv6/syncookies.c mptcp-mptcp_v0.95/net/ipv6/syncookies.c +--- linux-4.19.55/net/ipv6/syncookies.c 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/net/ipv6/syncookies.c 2019-06-24 09:39:58.000000000 +0200 @@ -20,6 +20,8 @@ #include #include @@ -6392,9 +6392,9 @@ diff -aurN linux-4.19.53/net/ipv6/syncookies.c mptcp-mptcp_v0.95/net/ipv6/syncoo ireq->rcv_wscale = rcv_wscale; ireq->ecn_ok = cookie_ecn_ok(&tcp_opt, sock_net(sk), dst); -diff -aurN linux-4.19.53/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6.c ---- linux-4.19.53/net/ipv6/tcp_ipv6.c 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6.c +--- linux-4.19.55/net/ipv6/tcp_ipv6.c 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6.c 2019-06-24 09:39:58.000000000 +0200 @@ -61,6 +61,8 @@ #include #include @@ -6977,9 +6977,9 @@ diff -aurN linux-4.19.53/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6 }; /* thinking of making this const? Don't. -diff -aurN linux-4.19.53/net/Kconfig mptcp-mptcp_v0.95/net/Kconfig ---- linux-4.19.53/net/Kconfig 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/Kconfig 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/Kconfig mptcp-mptcp_v0.95/net/Kconfig +--- linux-4.19.55/net/Kconfig 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/net/Kconfig 2019-06-24 09:39:58.000000000 +0200 @@ -89,6 +89,7 @@ source "net/ipv4/Kconfig" source "net/ipv6/Kconfig" @@ -6988,9 +6988,9 @@ diff -aurN linux-4.19.53/net/Kconfig mptcp-mptcp_v0.95/net/Kconfig endif # if INET -diff -aurN linux-4.19.53/net/Makefile mptcp-mptcp_v0.95/net/Makefile ---- linux-4.19.53/net/Makefile 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/net/Makefile 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/Makefile mptcp-mptcp_v0.95/net/Makefile +--- linux-4.19.55/net/Makefile 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/net/Makefile 2019-06-24 09:39:58.000000000 +0200 @@ -20,6 +20,7 @@ obj-$(CONFIG_XFRM) += xfrm/ obj-$(CONFIG_UNIX) += unix/ @@ -6999,9 +6999,9 @@ diff -aurN linux-4.19.53/net/Makefile mptcp-mptcp_v0.95/net/Makefile obj-$(CONFIG_BPFILTER) += bpfilter/ obj-$(CONFIG_PACKET) += packet/ obj-$(CONFIG_NET_KEY) += key/ -diff -aurN linux-4.19.53/net/mptcp/Kconfig mptcp-mptcp_v0.95/net/mptcp/Kconfig ---- linux-4.19.53/net/mptcp/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/Kconfig 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/mptcp/Kconfig mptcp-mptcp_v0.95/net/mptcp/Kconfig +--- linux-4.19.55/net/mptcp/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/Kconfig 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,146 @@ +# +# MPTCP configuration @@ -7149,9 +7149,9 @@ diff -aurN linux-4.19.53/net/mptcp/Kconfig mptcp-mptcp_v0.95/net/mptcp/Kconfig + default "redundant" if DEFAULT_REDUNDANT + default "default" + -diff -aurN linux-4.19.53/net/mptcp/Makefile mptcp-mptcp_v0.95/net/mptcp/Makefile ---- linux-4.19.53/net/mptcp/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/Makefile 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/mptcp/Makefile mptcp-mptcp_v0.95/net/mptcp/Makefile +--- linux-4.19.55/net/mptcp/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/Makefile 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,24 @@ +# +## Makefile for MultiPath TCP support code. @@ -7177,9 +7177,9 @@ diff -aurN linux-4.19.53/net/mptcp/Makefile mptcp-mptcp_v0.95/net/mptcp/Makefile +obj-$(CONFIG_MPTCP_BLEST) += mptcp_blest.o + +mptcp-$(subst m,y,$(CONFIG_IPV6)) += mptcp_ipv6.o -diff -aurN linux-4.19.53/net/mptcp/mctcp_desync.c mptcp-mptcp_v0.95/net/mptcp/mctcp_desync.c ---- linux-4.19.53/net/mptcp/mctcp_desync.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mctcp_desync.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/mptcp/mctcp_desync.c mptcp-mptcp_v0.95/net/mptcp/mctcp_desync.c +--- linux-4.19.55/net/mptcp/mctcp_desync.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mctcp_desync.c 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,193 @@ +/* + * Desynchronized Multi-Channel TCP Congestion Control Algorithm @@ -7374,9 +7374,9 @@ diff -aurN linux-4.19.53/net/mptcp/mctcp_desync.c mptcp-mptcp_v0.95/net/mptcp/mc +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("MCTCP: DESYNCHRONIZED MULTICHANNEL TCP CONGESTION CONTROL"); +MODULE_VERSION("1.0"); -diff -aurN linux-4.19.53/net/mptcp/mptcp_balia.c mptcp-mptcp_v0.95/net/mptcp/mptcp_balia.c ---- linux-4.19.53/net/mptcp/mptcp_balia.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_balia.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/mptcp/mptcp_balia.c mptcp-mptcp_v0.95/net/mptcp/mptcp_balia.c +--- linux-4.19.55/net/mptcp/mptcp_balia.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_balia.c 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,261 @@ +/* + * MPTCP implementation - Balia Congestion Control @@ -7639,9 +7639,9 @@ diff -aurN linux-4.19.53/net/mptcp/mptcp_balia.c mptcp-mptcp_v0.95/net/mptcp/mpt +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("MPTCP BALIA CONGESTION CONTROL ALGORITHM"); +MODULE_VERSION("0.1"); -diff -aurN linux-4.19.53/net/mptcp/mptcp_binder.c mptcp-mptcp_v0.95/net/mptcp/mptcp_binder.c ---- linux-4.19.53/net/mptcp/mptcp_binder.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_binder.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/mptcp/mptcp_binder.c mptcp-mptcp_v0.95/net/mptcp/mptcp_binder.c +--- linux-4.19.55/net/mptcp/mptcp_binder.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_binder.c 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,494 @@ +#include + @@ -8137,9 +8137,9 @@ diff -aurN linux-4.19.53/net/mptcp/mptcp_binder.c mptcp-mptcp_v0.95/net/mptcp/mp +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("BINDER MPTCP"); +MODULE_VERSION("0.1"); -diff -aurN linux-4.19.53/net/mptcp/mptcp_blest.c mptcp-mptcp_v0.95/net/mptcp/mptcp_blest.c ---- linux-4.19.53/net/mptcp/mptcp_blest.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_blest.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/mptcp/mptcp_blest.c mptcp-mptcp_v0.95/net/mptcp/mptcp_blest.c +--- linux-4.19.55/net/mptcp/mptcp_blest.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_blest.c 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,475 @@ +// SPDX-License-Identifier: GPL-2.0 +/* MPTCP Scheduler to reduce HoL-blocking and spurious retransmissions. @@ -8616,9 +8616,9 @@ diff -aurN linux-4.19.53/net/mptcp/mptcp_blest.c mptcp-mptcp_v0.95/net/mptcp/mpt +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("BLEST scheduler for MPTCP, based on default minimum RTT scheduler"); +MODULE_VERSION("0.95"); -diff -aurN linux-4.19.53/net/mptcp/mptcp_coupled.c mptcp-mptcp_v0.95/net/mptcp/mptcp_coupled.c ---- linux-4.19.53/net/mptcp/mptcp_coupled.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_coupled.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/mptcp/mptcp_coupled.c mptcp-mptcp_v0.95/net/mptcp/mptcp_coupled.c +--- linux-4.19.55/net/mptcp/mptcp_coupled.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_coupled.c 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,262 @@ +/* + * MPTCP implementation - Linked Increase congestion control Algorithm (LIA) @@ -8882,9 +8882,9 @@ diff -aurN linux-4.19.53/net/mptcp/mptcp_coupled.c mptcp-mptcp_v0.95/net/mptcp/m +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("MPTCP LINKED INCREASE CONGESTION CONTROL ALGORITHM"); +MODULE_VERSION("0.1"); -diff -aurN linux-4.19.53/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ctrl.c ---- linux-4.19.53/net/mptcp/mptcp_ctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ctrl.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ctrl.c +--- linux-4.19.55/net/mptcp/mptcp_ctrl.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ctrl.c 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,3124 @@ +/* + * MPTCP implementation - MPTCP-control @@ -9272,7 +9272,7 @@ diff -aurN linux-4.19.53/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.95/net/mptcp/mptc + &tp->mptcp_loc_token, NULL); +} + -+#ifdef HAVE_JUMP_LABEL ++#ifdef CONFIG_JUMP_LABEL +static atomic_t mptcp_needed_deferred; +static atomic_t mptcp_wanted; + @@ -9293,7 +9293,7 @@ diff -aurN linux-4.19.53/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.95/net/mptcp/mptc + +static void mptcp_enable_static_key_bh(void) +{ -+#ifdef HAVE_JUMP_LABEL ++#ifdef CONFIG_JUMP_LABEL + int wanted; + + while (1) { @@ -9312,7 +9312,7 @@ diff -aurN linux-4.19.53/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.95/net/mptcp/mptc + +static void mptcp_enable_static_key(void) +{ -+#ifdef HAVE_JUMP_LABEL ++#ifdef CONFIG_JUMP_LABEL + atomic_inc(&mptcp_wanted); + static_key_enable(&mptcp_static_key); +#else @@ -9322,7 +9322,7 @@ diff -aurN linux-4.19.53/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.95/net/mptcp/mptc + +void mptcp_disable_static_key(void) +{ -+#ifdef HAVE_JUMP_LABEL ++#ifdef CONFIG_JUMP_LABEL + int wanted; + + while (1) { @@ -11981,7 +11981,7 @@ diff -aurN linux-4.19.53/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.95/net/mptcp/mptc + if (mptcp_register_scheduler(&mptcp_sched_default)) + goto register_sched_failed; + -+ pr_info("MPTCP: Stable release v0.95-rc"); ++ pr_info("MPTCP: Stable release v0.95"); + + mptcp_init_failed = false; + @@ -12010,9 +12010,9 @@ diff -aurN linux-4.19.53/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.95/net/mptcp/mptc +mptcp_sock_cache_failed: + mptcp_init_failed = true; +} -diff -aurN linux-4.19.53/net/mptcp/mptcp_fullmesh.c mptcp-mptcp_v0.95/net/mptcp/mptcp_fullmesh.c ---- linux-4.19.53/net/mptcp/mptcp_fullmesh.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_fullmesh.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/mptcp/mptcp_fullmesh.c mptcp-mptcp_v0.95/net/mptcp/mptcp_fullmesh.c +--- linux-4.19.55/net/mptcp/mptcp_fullmesh.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_fullmesh.c 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,1941 @@ +#include +#include @@ -13955,9 +13955,9 @@ diff -aurN linux-4.19.53/net/mptcp/mptcp_fullmesh.c mptcp-mptcp_v0.95/net/mptcp/ +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Full-Mesh MPTCP"); +MODULE_VERSION("0.88"); -diff -aurN linux-4.19.53/net/mptcp/mptcp_input.c mptcp-mptcp_v0.95/net/mptcp/mptcp_input.c ---- linux-4.19.53/net/mptcp/mptcp_input.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_input.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/mptcp/mptcp_input.c mptcp-mptcp_v0.95/net/mptcp/mptcp_input.c +--- linux-4.19.55/net/mptcp/mptcp_input.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_input.c 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,2400 @@ +/* + * MPTCP implementation - Sending side @@ -16359,9 +16359,9 @@ diff -aurN linux-4.19.53/net/mptcp/mptcp_input.c mptcp-mptcp_v0.95/net/mptcp/mpt + tcp_set_rto(sk); + mptcp_set_rto(sk); +} -diff -aurN linux-4.19.53/net/mptcp/mptcp_ipv4.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv4.c ---- linux-4.19.53/net/mptcp/mptcp_ipv4.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv4.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/mptcp/mptcp_ipv4.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv4.c +--- linux-4.19.55/net/mptcp/mptcp_ipv4.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv4.c 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,427 @@ +/* + * MPTCP implementation - IPv4-specific functions @@ -16790,9 +16790,9 @@ diff -aurN linux-4.19.53/net/mptcp/mptcp_ipv4.c mptcp-mptcp_v0.95/net/mptcp/mptc + kmem_cache_destroy(mptcp_request_sock_ops.slab); + kfree(mptcp_request_sock_ops.slab_name); +} -diff -aurN linux-4.19.53/net/mptcp/mptcp_ipv6.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv6.c ---- linux-4.19.53/net/mptcp/mptcp_ipv6.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv6.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/mptcp/mptcp_ipv6.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv6.c +--- linux-4.19.55/net/mptcp/mptcp_ipv6.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv6.c 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,475 @@ +/* + * MPTCP implementation - IPv6-specific functions @@ -17269,9 +17269,9 @@ diff -aurN linux-4.19.53/net/mptcp/mptcp_ipv6.c mptcp-mptcp_v0.95/net/mptcp/mptc + kmem_cache_destroy(mptcp6_request_sock_ops.slab); + kfree(mptcp6_request_sock_ops.slab_name); +} -diff -aurN linux-4.19.53/net/mptcp/mptcp_ndiffports.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ndiffports.c ---- linux-4.19.53/net/mptcp/mptcp_ndiffports.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ndiffports.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/mptcp/mptcp_ndiffports.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ndiffports.c +--- linux-4.19.55/net/mptcp/mptcp_ndiffports.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ndiffports.c 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,174 @@ +#include + @@ -17447,9 +17447,9 @@ diff -aurN linux-4.19.53/net/mptcp/mptcp_ndiffports.c mptcp-mptcp_v0.95/net/mptc +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("NDIFF-PORTS MPTCP"); +MODULE_VERSION("0.88"); -diff -aurN linux-4.19.53/net/mptcp/mptcp_netlink.c mptcp-mptcp_v0.95/net/mptcp/mptcp_netlink.c ---- linux-4.19.53/net/mptcp/mptcp_netlink.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_netlink.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/mptcp/mptcp_netlink.c mptcp-mptcp_v0.95/net/mptcp/mptcp_netlink.c +--- linux-4.19.55/net/mptcp/mptcp_netlink.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_netlink.c 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,1277 @@ +// SPDX-License-Identifier: GPL-2.0 +/* MPTCP implementation - Netlink Path Manager @@ -18728,9 +18728,9 @@ diff -aurN linux-4.19.53/net/mptcp/mptcp_netlink.c mptcp-mptcp_v0.95/net/mptcp/m +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("MPTCP netlink-based path manager"); +MODULE_ALIAS_GENL_FAMILY(MPTCP_GENL_NAME); -diff -aurN linux-4.19.53/net/mptcp/mptcp_olia.c mptcp-mptcp_v0.95/net/mptcp/mptcp_olia.c ---- linux-4.19.53/net/mptcp/mptcp_olia.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_olia.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/mptcp/mptcp_olia.c mptcp-mptcp_v0.95/net/mptcp/mptcp_olia.c +--- linux-4.19.55/net/mptcp/mptcp_olia.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_olia.c 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,318 @@ +/* + * MPTCP implementation - OPPORTUNISTIC LINKED INCREASES CONGESTION CONTROL: @@ -19050,9 +19050,9 @@ diff -aurN linux-4.19.53/net/mptcp/mptcp_olia.c mptcp-mptcp_v0.95/net/mptcp/mptc +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("MPTCP COUPLED CONGESTION CONTROL"); +MODULE_VERSION("0.1"); -diff -aurN linux-4.19.53/net/mptcp/mptcp_output.c mptcp-mptcp_v0.95/net/mptcp/mptcp_output.c ---- linux-4.19.53/net/mptcp/mptcp_output.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_output.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/mptcp/mptcp_output.c mptcp-mptcp_v0.95/net/mptcp/mptcp_output.c +--- linux-4.19.55/net/mptcp/mptcp_output.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_output.c 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,1929 @@ +/* + * MPTCP implementation - Sending side @@ -20983,9 +20983,9 @@ diff -aurN linux-4.19.53/net/mptcp/mptcp_output.c mptcp-mptcp_v0.95/net/mptcp/mp + return max(xmit_size_goal, mss_now); +} + -diff -aurN linux-4.19.53/net/mptcp/mptcp_pm.c mptcp-mptcp_v0.95/net/mptcp/mptcp_pm.c ---- linux-4.19.53/net/mptcp/mptcp_pm.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_pm.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/mptcp/mptcp_pm.c mptcp-mptcp_v0.95/net/mptcp/mptcp_pm.c +--- linux-4.19.55/net/mptcp/mptcp_pm.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_pm.c 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,226 @@ +/* + * MPTCP implementation - MPTCP-subflow-management @@ -21213,9 +21213,9 @@ diff -aurN linux-4.19.53/net/mptcp/mptcp_pm.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ + return mptcp_set_default_path_manager(CONFIG_DEFAULT_MPTCP_PM); +} +late_initcall(mptcp_path_manager_default); -diff -aurN linux-4.19.53/net/mptcp/mptcp_redundant.c mptcp-mptcp_v0.95/net/mptcp/mptcp_redundant.c ---- linux-4.19.53/net/mptcp/mptcp_redundant.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_redundant.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/mptcp/mptcp_redundant.c mptcp-mptcp_v0.95/net/mptcp/mptcp_redundant.c +--- linux-4.19.55/net/mptcp/mptcp_redundant.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_redundant.c 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,389 @@ +/* + * MPTCP Scheduler to reduce latency and jitter. @@ -21606,9 +21606,9 @@ diff -aurN linux-4.19.53/net/mptcp/mptcp_redundant.c mptcp-mptcp_v0.95/net/mptcp +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("REDUNDANT MPTCP"); +MODULE_VERSION("0.90"); -diff -aurN linux-4.19.53/net/mptcp/mptcp_rr.c mptcp-mptcp_v0.95/net/mptcp/mptcp_rr.c ---- linux-4.19.53/net/mptcp/mptcp_rr.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_rr.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/mptcp/mptcp_rr.c mptcp-mptcp_v0.95/net/mptcp/mptcp_rr.c +--- linux-4.19.55/net/mptcp/mptcp_rr.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_rr.c 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,309 @@ +/* MPTCP Scheduler module selector. Highly inspired by tcp_cong.c */ + @@ -21919,9 +21919,9 @@ diff -aurN linux-4.19.53/net/mptcp/mptcp_rr.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("ROUNDROBIN MPTCP"); +MODULE_VERSION("0.89"); -diff -aurN linux-4.19.53/net/mptcp/mptcp_sched.c mptcp-mptcp_v0.95/net/mptcp/mptcp_sched.c ---- linux-4.19.53/net/mptcp/mptcp_sched.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_sched.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/mptcp/mptcp_sched.c mptcp-mptcp_v0.95/net/mptcp/mptcp_sched.c +--- linux-4.19.55/net/mptcp/mptcp_sched.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_sched.c 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,635 @@ +/* MPTCP Scheduler module selector. Highly inspired by tcp_cong.c */ + @@ -22558,9 +22558,9 @@ diff -aurN linux-4.19.53/net/mptcp/mptcp_sched.c mptcp-mptcp_v0.95/net/mptcp/mpt + return mptcp_set_default_scheduler(CONFIG_DEFAULT_MPTCP_SCHED); +} +late_initcall(mptcp_scheduler_default); -diff -aurN linux-4.19.53/net/mptcp/mptcp_wvegas.c mptcp-mptcp_v0.95/net/mptcp/mptcp_wvegas.c ---- linux-4.19.53/net/mptcp/mptcp_wvegas.c 1970-01-01 01:00:00.000000000 +0100 -+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_wvegas.c 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/net/mptcp/mptcp_wvegas.c mptcp-mptcp_v0.95/net/mptcp/mptcp_wvegas.c +--- linux-4.19.55/net/mptcp/mptcp_wvegas.c 1970-01-01 01:00:00.000000000 +0100 ++++ mptcp-mptcp_v0.95/net/mptcp/mptcp_wvegas.c 2019-06-24 09:39:58.000000000 +0200 @@ -0,0 +1,271 @@ +/* + * MPTCP implementation - WEIGHTED VEGAS @@ -22833,9 +22833,9 @@ diff -aurN linux-4.19.53/net/mptcp/mptcp_wvegas.c mptcp-mptcp_v0.95/net/mptcp/mp +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("MPTCP wVegas"); +MODULE_VERSION("0.1"); -diff -aurN linux-4.19.53/tools/include/uapi/linux/bpf.h mptcp-mptcp_v0.95/tools/include/uapi/linux/bpf.h ---- linux-4.19.53/tools/include/uapi/linux/bpf.h 2019-06-19 08:18:07.000000000 +0200 -+++ mptcp-mptcp_v0.95/tools/include/uapi/linux/bpf.h 2019-06-22 05:42:25.000000000 +0200 +diff -aurN linux-4.19.55/tools/include/uapi/linux/bpf.h mptcp-mptcp_v0.95/tools/include/uapi/linux/bpf.h +--- linux-4.19.55/tools/include/uapi/linux/bpf.h 2019-06-22 11:23:18.000000000 +0200 ++++ mptcp-mptcp_v0.95/tools/include/uapi/linux/bpf.h 2019-06-24 09:39:58.000000000 +0200 @@ -2671,6 +2671,7 @@ BPF_TCP_LISTEN, BPF_TCP_CLOSING, /* Now a valid state */