mptcp/openmptcprouter
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter.git synced 2025-02-12 19:31:52 +00:00
Code Issues Releases Wiki Activity

Add latest mptcp patches

Browse source
This commit is contained in:
Ycarus 2019-01-28 18:29:08 +01:00
parent 0e2b9dc16c
commit c441305f0f
1 changed files with 204 additions and 187 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

391
root/target/linux/generic/hack-4.14/690-mptcp_v0.94.patch
View file

@ -1,6 +1,6 @@
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
diff -aurN linux-4.14.94/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
--- a/Documentation/networking/ip-sysctl.txt 2019-01-16 22:07:13.000000000 +0100
+++ b/Documentation/networking/ip-sysctl.txt 2019-01-23 00:56:55.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 linux-4.14.89/Documentation/networking/ip-sysctl.txt mptcp-mptcp_v0.9
UDP variables:
udp_l3mdev_accept - BOOLEAN
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
diff -aurN a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
--- a/drivers/infiniband/hw/cxgb4/cm.c 2019-01-16 22:07:13.000000000 +0100
+++ b/drivers/infiniband/hw/cxgb4/cm.c 2019-01-23 00:56:55.000000000 +0100
@@ -3752,7 +3752,7 @@
*/
memset(&tmp_opt, 0, sizeof(tmp_opt));
@ -32,9 +32,9 @@ diff -aurN linux-4.14.89/drivers/infiniband/hw/cxgb4/cm.c mptcp-mptcp_v0.94/driv
req = __skb_push(skb, sizeof(*req));
memset(req, 0, sizeof(*req));
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
diff -aurN a/include/linux/skbuff.h b/include/linux/skbuff.h
--- a/include/linux/skbuff.h 2019-01-16 22:07:13.000000000 +0100
+++ b/include/linux/skbuff.h 2019-01-23 00:56:55.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 linux-4.14.89/include/linux/skbuff.h mptcp-mptcp_v0.94/include/linux/
unsigned long _skb_refdst;
void (*destructor)(struct sk_buff *skb);
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
diff -aurN a/include/linux/tcp.h b/include/linux/tcp.h
--- a/include/linux/tcp.h 2019-01-16 22:07:13.000000000 +0100
+++ b/include/linux/tcp.h 2019-01-23 00:56:55.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 linux-4.14.89/include/linux/tcp.h mptcp-mptcp_v0.94/include/linux/tcp
};
static inline struct tcp_timewait_sock *tcp_twsk(const struct sock *sk)
diff -aurN linux-4.14.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
diff -aurN a/include/net/inet_common.h b/include/net/inet_common.h
--- a/include/net/inet_common.h 2019-01-16 22:07:13.000000000 +0100
+++ b/include/net/inet_common.h 2019-01-23 00:56:55.000000000 +0100
@@ -2,6 +2,8 @@
#ifndef _INET_COMMON_H
#define _INET_COMMON_H
@ -224,9 +224,9 @@ diff -aurN linux-4.14.89/include/net/inet_common.h mptcp-mptcp_v0.94/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.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
diff -aurN a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
--- a/include/net/inet_connection_sock.h 2019-01-16 22:07:13.000000000 +0100
+++ b/include/net/inet_connection_sock.h 2019-01-23 00:56:55.000000000 +0100
@@ -30,6 +30,7 @@
struct inet_bind_bucket;
@ -235,9 +235,9 @@ diff -aurN linux-4.14.89/include/net/inet_connection_sock.h mptcp-mptcp_v0.94/in
/*
* Pointers to address related TCP functions
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
diff -aurN a/include/net/inet_sock.h b/include/net/inet_sock.h
--- a/include/net/inet_sock.h 2019-01-16 22:07:13.000000000 +0100
+++ b/include/net/inet_sock.h 2019-01-23 00:56:55.000000000 +0100
@@ -90,7 +90,9 @@
wscale_ok : 1,
ecn_ok : 1,
@ -249,9 +249,9 @@ diff -aurN linux-4.14.89/include/net/inet_sock.h mptcp-mptcp_v0.94/include/net/i
u32 ir_mark;
union {
struct ip_options_rcu __rcu *ireq_opt;
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
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 2019-01-23 00:56:55.000000000 +0100
@@ -0,0 +1,1510 @@
+/*
+ * MPTCP implementation
@ -1763,9 +1763,9 @@ diff -aurN linux-4.14.89/include/net/mptcp.h mptcp-mptcp_v0.94/include/net/mptcp
+#endif /* CONFIG_MPTCP */
+
+#endif /* _MPTCP_H */
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
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 2019-01-23 00:56:55.000000000 +0100
@@ -0,0 +1,68 @@
+/*
+ * MPTCP implementation
@ -1835,9 +1835,9 @@ diff -aurN linux-4.14.89/include/net/mptcp_v4.h mptcp-mptcp_v0.94/include/net/mp
+#endif /* CONFIG_MPTCP */
+
+#endif /* MPTCP_V4_H_ */
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
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 2019-01-23 00:56:55.000000000 +0100
@@ -0,0 +1,69 @@
+/*
+ * MPTCP implementation
@ -1908,9 +1908,9 @@ diff -aurN linux-4.14.89/include/net/mptcp_v6.h mptcp-mptcp_v0.94/include/net/mp
+#endif /* CONFIG_MPTCP */
+
+#endif /* _MPTCP_V6_H */
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
diff -aurN a/include/net/net_namespace.h b/include/net/net_namespace.h
--- a/include/net/net_namespace.h 2019-01-16 22:07:13.000000000 +0100
+++ b/include/net/net_namespace.h 2019-01-23 00:56:55.000000000 +0100
@@ -18,6 +18,7 @@
#include <net/netns/packet.h>
#include <net/netns/ipv4.h>
@ -1929,9 +1929,9 @@ diff -aurN linux-4.14.89/include/net/net_namespace.h mptcp-mptcp_v0.94/include/n
#if IS_ENABLED(CONFIG_IEEE802154_6LOWPAN)
struct netns_ieee802154_lowpan ieee802154_lowpan;
#endif
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
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 2019-01-23 00:56:55.000000000 +0100
@@ -0,0 +1,52 @@
+/*
+ * MPTCP implementation - MPTCP namespace
@ -1985,9 +1985,9 @@ diff -aurN linux-4.14.89/include/net/netns/mptcp.h mptcp-mptcp_v0.94/include/net
+};
+
+#endif /* __NETNS_MPTCP_H__ */
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
diff -aurN a/include/net/snmp.h b/include/net/snmp.h
--- a/include/net/snmp.h 2019-01-16 22:07:13.000000000 +0100
+++ b/include/net/snmp.h 2019-01-23 00:56:55.000000000 +0100
@@ -91,7 +91,6 @@
atomic_long_t mibs[ICMP6MSG_MIB_MAX];
};
@ -1996,10 +1996,10 @@ diff -aurN linux-4.14.89/include/net/snmp.h mptcp-mptcp_v0.94/include/net/snmp.h
/* TCP */
#define TCP_MIB_MAX __TCP_MIB_MAX
struct tcp_mib {
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 @@
diff -aurN a/include/net/sock.h b/include/net/sock.h
--- a/include/net/sock.h 2019-01-16 22:07:13.000000000 +0100
+++ b/include/net/sock.h 2019-01-23 00:56:55.000000000 +0100
@@ -775,6 +775,7 @@
SOCK_FILTER_LOCKED, /* Filter cannot be changed anymore */
SOCK_SELECT_ERR_QUEUE, /* Wake select on error queue */
SOCK_RCU_FREE, /* wait rcu grace period in sk_destruct() */
@ -2007,7 +2007,7 @@ diff -aurN linux-4.14.89/include/net/sock.h mptcp-mptcp_v0.94/include/net/sock.h
};
#define SK_FLAGS_TIMESTAMP ((1UL << SOCK_TIMESTAMP) | (1UL << SOCK_TIMESTAMPING_RX_SOFTWARE))
@@ -1071,6 +1072,7 @@
@@ -1075,6 +1076,7 @@
void (*unhash)(struct sock *sk);
void (*rehash)(struct sock *sk);
int (*get_port)(struct sock *sk, unsigned short snum);
@ -2015,9 +2015,19 @@ diff -aurN linux-4.14.89/include/net/sock.h mptcp-mptcp_v0.94/include/net/sock.h
/* Keeping track of sockets in use */
#ifdef CONFIG_PROC_FS
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
@@ -1499,9 +1501,6 @@
static inline void sock_owned_by_me(const struct sock *sk)
{
-#ifdef CONFIG_LOCKDEP
- WARN_ON_ONCE(!lockdep_sock_is_held(sk) && debug_locks);
-#endif
}
static inline bool sock_owned_by_user(const struct sock *sk)
diff -aurN a/include/net/tcp.h b/include/net/tcp.h
--- a/include/net/tcp.h 2019-01-16 22:07:13.000000000 +0100
+++ b/include/net/tcp.h 2019-01-23 00:56:55.000000000 +0100
@@ -185,6 +185,7 @@
#define TCPOPT_SACK 5 /* SACK Block */
#define TCPOPT_TIMESTAMP 8 /* Better RTT estimations/PAWS */
@ -2338,9 +2348,9 @@ diff -aurN linux-4.14.89/include/net/tcp.h mptcp-mptcp_v0.94/include/net/tcp.h
const struct sock *sk, struct sk_buff *skb,
__u16 *mss)
{
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
diff -aurN a/include/net/tcp_states.h b/include/net/tcp_states.h
--- a/include/net/tcp_states.h 2019-01-16 22:07:13.000000000 +0100
+++ b/include/net/tcp_states.h 2019-01-23 00:56:55.000000000 +0100
@@ -26,6 +26,7 @@
TCP_LISTEN,
TCP_CLOSING, /* Now a valid state */
@ -2357,9 +2367,9 @@ diff -aurN linux-4.14.89/include/net/tcp_states.h mptcp-mptcp_v0.94/include/net/
};
#endif /* _LINUX_TCP_STATES_H */
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
diff -aurN a/include/net/transp_v6.h b/include/net/transp_v6.h
--- a/include/net/transp_v6.h 2019-01-16 22:07:13.000000000 +0100
+++ b/include/net/transp_v6.h 2019-01-23 00:56:55.000000000 +0100
@@ -59,6 +59,8 @@
/* address family specific functions */
@ -2369,9 +2379,9 @@ diff -aurN linux-4.14.89/include/net/transp_v6.h mptcp-mptcp_v0.94/include/net/t
void inet6_destroy_sock(struct sock *sk);
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
diff -aurN a/include/uapi/linux/if.h b/include/uapi/linux/if.h
--- a/include/uapi/linux/if.h 2019-01-16 22:07:13.000000000 +0100
+++ b/include/uapi/linux/if.h 2019-01-23 00:56:55.000000000 +0100
@@ -132,6 +132,9 @@
#define IFF_ECHO IFF_ECHO
#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
@ -2382,9 +2392,9 @@ diff -aurN linux-4.14.89/include/uapi/linux/if.h mptcp-mptcp_v0.94/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.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
diff -aurN a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
--- a/include/uapi/linux/tcp.h 2019-01-16 22:07:13.000000000 +0100
+++ b/include/uapi/linux/tcp.h 2019-01-23 00:56:55.000000000 +0100
@@ -18,9 +18,15 @@
#ifndef _UAPI_LINUX_TCP_H
#define _UAPI_LINUX_TCP_H
@ -2469,9 +2479,22 @@ diff -aurN linux-4.14.89/include/uapi/linux/tcp.h mptcp-mptcp_v0.94/include/uapi
/* for TCP_MD5SIG socket option */
#define TCP_MD5SIG_MAXKEYLEN 80
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
diff -aurN a/kernel/rcu/Kconfig.debug b/kernel/rcu/Kconfig.debug
--- a/kernel/rcu/Kconfig.debug 2019-01-16 22:07:13.000000000 +0100
+++ b/kernel/rcu/Kconfig.debug 2019-01-23 00:56:55.000000000 +0100
@@ -4,9 +4,6 @@
menu "RCU Debugging"
-config PROVE_RCU
- def_bool PROVE_LOCKING
-
config TORTURE_TEST
tristate
default n
diff -aurN a/net/core/dev.c b/net/core/dev.c
--- a/net/core/dev.c 2019-01-16 22:07:13.000000000 +0100
+++ b/net/core/dev.c 2019-01-23 00:56:55.000000000 +0100
@@ -6766,7 +6766,7 @@
dev->flags = (flags & (IFF_DEBUG | IFF_NOTRAILERS | IFF_NOARP |
@ -2481,9 +2504,9 @@ diff -aurN linux-4.14.89/net/core/dev.c mptcp-mptcp_v0.94/net/core/dev.c
(dev->flags & (IFF_UP | IFF_VOLATILE | IFF_PROMISC |
IFF_ALLMULTI));
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
diff -aurN a/net/core/skbuff.c b/net/core/skbuff.c
--- a/net/core/skbuff.c 2019-01-16 22:07:13.000000000 +0100
+++ b/net/core/skbuff.c 2019-01-23 00:56:55.000000000 +0100
@@ -532,7 +532,7 @@
skb_drop_list(&skb_shinfo(skb)->frag_list);
}
@ -2502,9 +2525,9 @@ diff -aurN linux-4.14.89/net/core/skbuff.c mptcp-mptcp_v0.94/net/core/skbuff.c
{
__copy_skb_header(new, old);
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
diff -aurN a/net/core/sock.c b/net/core/sock.c
--- a/net/core/sock.c 2019-01-16 22:07:13.000000000 +0100
+++ b/net/core/sock.c 2019-01-23 00:56:55.000000000 +0100
@@ -139,6 +139,11 @@
#include <trace/events/sock.h>
@ -2564,9 +2587,9 @@ diff -aurN linux-4.14.89/net/core/sock.c mptcp-mptcp_v0.94/net/core/sock.c
mem_cgroup_sk_alloc(newsk);
cgroup_sk_alloc(&newsk->sk_cgrp_data);
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
diff -aurN a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
--- a/net/ipv4/af_inet.c 2019-01-16 22:07:13.000000000 +0100
+++ b/net/ipv4/af_inet.c 2019-01-23 00:56:55.000000000 +0100
@@ -104,6 +104,7 @@
#include <net/ip_fib.h>
#include <net/inet_connection_sock.h>
@ -2629,9 +2652,9 @@ diff -aurN linux-4.14.89/net/ipv4/af_inet.c mptcp-mptcp_v0.94/net/ipv4/af_inet.c
/* Setup TCP slab cache for open requests. */
tcp_init();
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
diff -aurN a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
--- a/net/ipv4/inet_connection_sock.c 2019-01-16 22:07:13.000000000 +0100
+++ b/net/ipv4/inet_connection_sock.c 2019-01-23 00:56:55.000000000 +0100
@@ -23,6 +23,7 @@
#include <net/route.h>
#include <net/tcp_states.h>
@ -2685,9 +2708,9 @@ diff -aurN linux-4.14.89/net/ipv4/inet_connection_sock.c mptcp-mptcp_v0.94/net/i
sock_put(child);
cond_resched();
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
diff -aurN a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
--- a/net/ipv4/ip_sockglue.c 2019-01-16 22:07:13.000000000 +0100
+++ b/net/ipv4/ip_sockglue.c 2019-01-23 00:56:55.000000000 +0100
@@ -44,6 +44,8 @@
#endif
#include <net/ip_fib.h>
@ -2715,9 +2738,9 @@ diff -aurN linux-4.14.89/net/ipv4/ip_sockglue.c mptcp-mptcp_v0.94/net/ipv4/ip_so
}
break;
case IP_TTL:
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
diff -aurN a/net/ipv4/Kconfig b/net/ipv4/Kconfig
--- a/net/ipv4/Kconfig 2019-01-16 22:07:13.000000000 +0100
+++ b/net/ipv4/Kconfig 2019-01-23 00:56:55.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 +2810,9 @@ diff -aurN linux-4.14.89/net/ipv4/Kconfig mptcp-mptcp_v0.94/net/ipv4/Kconfig
default "reno" if DEFAULT_RENO
default "dctcp" if DEFAULT_DCTCP
default "cdg" if DEFAULT_CDG
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
diff -aurN a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c
--- a/net/ipv4/syncookies.c 2019-01-16 22:07:13.000000000 +0100
+++ b/net/ipv4/syncookies.c 2019-01-23 00:56:55.000000000 +0100
@@ -16,6 +16,8 @@
#include <linux/siphash.h>
#include <linux/kernel.h>
@ -2902,9 +2925,9 @@ diff -aurN linux-4.14.89/net/ipv4/syncookies.c mptcp-mptcp_v0.94/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.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
diff -aurN a/net/ipv4/tcp.c b/net/ipv4/tcp.c
--- a/net/ipv4/tcp.c 2019-01-16 22:07:13.000000000 +0100
+++ b/net/ipv4/tcp.c 2019-01-23 00:56:55.000000000 +0100
@@ -273,6 +273,7 @@
#include <net/icmp.h>
@ -3532,9 +3555,9 @@ diff -aurN linux-4.14.89/net/ipv4/tcp.c mptcp-mptcp_v0.94/net/ipv4/tcp.c
return 0;
}
EXPORT_SYMBOL_GPL(tcp_abort);
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
diff -aurN a/net/ipv4/tcp_fastopen.c b/net/ipv4/tcp_fastopen.c
--- a/net/ipv4/tcp_fastopen.c 2019-01-16 22:07:13.000000000 +0100
+++ b/net/ipv4/tcp_fastopen.c 2019-01-23 00:56:55.000000000 +0100
@@ -9,6 +9,7 @@
#include <linux/rculist.h>
#include <net/inetpeer.h>
@ -3587,9 +3610,9 @@ diff -aurN linux-4.14.89/net/ipv4/tcp_fastopen.c mptcp-mptcp_v0.94/net/ipv4/tcp_
/* tcp_conn_request() is sending the SYNACK,
* and queues the child into listener accept queue.
*/
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
diff -aurN a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
--- a/net/ipv4/tcp_input.c 2019-01-16 22:07:13.000000000 +0100
+++ b/net/ipv4/tcp_input.c 2019-01-23 00:56:55.000000000 +0100
@@ -76,6 +76,9 @@
#include <linux/ipsec.h>
#include <asm/unaligned.h>
@ -4433,9 +4456,9 @@ diff -aurN linux-4.14.89/net/ipv4/tcp_input.c mptcp-mptcp_v0.94/net/ipv4/tcp_inp
sock_put(fastopen_sk);
} else {
tcp_rsk(req)->tfo_listener = false;
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
diff -aurN a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
--- a/net/ipv4/tcp_ipv4.c 2019-01-16 22:07:13.000000000 +0100
+++ b/net/ipv4/tcp_ipv4.c 2019-01-23 00:56:55.000000000 +0100
@@ -67,6 +67,8 @@
#include <net/icmp.h>
#include <net/inet_hashtables.h>
@ -4913,15 +4936,9 @@ diff -aurN linux-4.14.89/net/ipv4/tcp_ipv4.c mptcp-mptcp_v0.94/net/ipv4/tcp_ipv4
tcp_cleanup_ulp(sk);
/* Cleanup up the write buffer. */
@@ -2441,7 +2565,15 @@
.compat_setsockopt = compat_tcp_setsockopt,
@@ -2442,6 +2566,9 @@
.compat_getsockopt = compat_tcp_getsockopt,
#endif
+#ifdef CONFIG_MEMCG_KMEM
+ .init_cgroup = tcp_init_cgroup,
+ .destroy_cgroup = tcp_destroy_cgroup,
+ .proto_cgroup = tcp_proto_cgroup,
+#endif
.diag_destroy = tcp_abort,
+#ifdef CONFIG_MPTCP
+ .clear_sk = mptcp_clear_sk,
@ -4929,9 +4946,9 @@ diff -aurN linux-4.14.89/net/ipv4/tcp_ipv4.c mptcp-mptcp_v0.94/net/ipv4/tcp_ipv4
};
EXPORT_SYMBOL(tcp_prot);
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
diff -aurN a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
--- a/net/ipv4/tcp_minisocks.c 2019-01-16 22:07:13.000000000 +0100
+++ b/net/ipv4/tcp_minisocks.c 2019-01-23 00:56:55.000000000 +0100
@@ -18,11 +18,13 @@
* Jorge Cwik, <jorge@laser.satlink.net>
*/
@ -5142,9 +5159,9 @@ diff -aurN linux-4.14.89/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.94/net/ipv4/tcp
sock_put(child);
return ret;
}
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
diff -aurN a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
--- a/net/ipv4/tcp_output.c 2019-01-16 22:07:13.000000000 +0100
+++ b/net/ipv4/tcp_output.c 2019-01-23 00:56:55.000000000 +0100
@@ -36,6 +36,12 @@
#define pr_fmt(fmt) "TCP: " fmt
@ -5745,9 +5762,9 @@ diff -aurN linux-4.14.89/net/ipv4/tcp_output.c mptcp-mptcp_v0.94/net/ipv4/tcp_ou
if (tp->packets_out || !tcp_send_head(sk)) {
/* Cancel probe timer, if it is not required. */
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
diff -aurN a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
--- a/net/ipv4/tcp_timer.c 2019-01-16 22:07:13.000000000 +0100
+++ b/net/ipv4/tcp_timer.c 2019-01-23 00:56:55.000000000 +0100
@@ -20,6 +20,7 @@
#include <linux/module.h>
@ -5945,9 +5962,9 @@ diff -aurN linux-4.14.89/net/ipv4/tcp_timer.c mptcp-mptcp_v0.94/net/ipv4/tcp_tim
sock_put(sk);
}
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
diff -aurN a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
--- a/net/ipv6/addrconf.c 2019-01-16 22:07:13.000000000 +0100
+++ b/net/ipv6/addrconf.c 2019-01-23 00:56:55.000000000 +0100
@@ -928,6 +928,7 @@
kfree_rcu(ifp, rcu);
@ -5956,9 +5973,9 @@ diff -aurN linux-4.14.89/net/ipv6/addrconf.c mptcp-mptcp_v0.94/net/ipv6/addrconf
static void
ipv6_link_dev_addr(struct inet6_dev *idev, struct inet6_ifaddr *ifp)
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
diff -aurN a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
--- a/net/ipv6/af_inet6.c 2019-01-16 22:07:13.000000000 +0100
+++ b/net/ipv6/af_inet6.c 2019-01-23 00:56:55.000000000 +0100
@@ -107,8 +107,7 @@
return (struct ipv6_pinfo *)(((u8 *)sk) + offset);
}
@ -5969,9 +5986,9 @@ diff -aurN linux-4.14.89/net/ipv6/af_inet6.c mptcp-mptcp_v0.94/net/ipv6/af_inet6
{
struct inet_sock *inet;
struct ipv6_pinfo *np;
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
diff -aurN a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
--- a/net/ipv6/ipv6_sockglue.c 2019-01-16 22:07:13.000000000 +0100
+++ b/net/ipv6/ipv6_sockglue.c 2019-01-23 00:56:55.000000000 +0100
@@ -48,6 +48,8 @@
#include <net/addrconf.h>
#include <net/inet_common.h>
@ -5995,9 +6012,9 @@ diff -aurN linux-4.14.89/net/ipv6/ipv6_sockglue.c mptcp-mptcp_v0.94/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.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
diff -aurN a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c
--- a/net/ipv6/syncookies.c 2019-01-16 22:07:13.000000000 +0100
+++ b/net/ipv6/syncookies.c 2019-01-23 00:56:55.000000000 +0100
@@ -20,6 +20,8 @@
#include <linux/kernel.h>
#include <net/secure_seq.h>
@ -6079,9 +6096,9 @@ diff -aurN linux-4.14.89/net/ipv6/syncookies.c mptcp-mptcp_v0.94/net/ipv6/syncoo
ireq->rcv_wscale = rcv_wscale;
ireq->ecn_ok = cookie_ecn_ok(&tcp_opt, sock_net(sk), dst);
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
diff -aurN a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
--- a/net/ipv6/tcp_ipv6.c 2019-01-16 22:07:13.000000000 +0100
+++ b/net/ipv6/tcp_ipv6.c 2019-01-23 00:56:55.000000000 +0100
@@ -61,6 +61,8 @@
#include <net/timewait_sock.h>
#include <net/inet_common.h>
@ -6703,9 +6720,9 @@ diff -aurN linux-4.14.89/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.94/net/ipv6/tcp_ipv6
};
/* thinking of making this const? Don't.
diff -aurN linux-4.14.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
diff -aurN a/net/Kconfig b/net/Kconfig
--- a/net/Kconfig 2019-01-16 22:07:13.000000000 +0100
+++ b/net/Kconfig 2019-01-23 00:56:55.000000000 +0100
@@ -88,6 +88,7 @@
source "net/ipv4/Kconfig"
source "net/ipv6/Kconfig"
@ -6714,9 +6731,9 @@ diff -aurN linux-4.14.89/net/Kconfig mptcp-mptcp_v0.94/net/Kconfig
endif # if INET
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
diff -aurN a/net/Makefile b/net/Makefile
--- a/net/Makefile 2019-01-16 22:07:13.000000000 +0100
+++ b/net/Makefile 2019-01-23 00:56:55.000000000 +0100
@@ -20,6 +20,7 @@
obj-$(CONFIG_XFRM) += xfrm/
obj-$(CONFIG_UNIX) += unix/
@ -6725,9 +6742,9 @@ diff -aurN linux-4.14.89/net/Makefile mptcp-mptcp_v0.94/net/Makefile
obj-$(CONFIG_PACKET) += packet/
obj-$(CONFIG_NET_KEY) += key/
obj-$(CONFIG_BRIDGE) += bridge/
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
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 2019-01-23 00:56:55.000000000 +0100
@@ -0,0 +1,129 @@
+#
+# MPTCP configuration
@ -6858,9 +6875,9 @@ diff -aurN linux-4.14.89/net/mptcp/Kconfig mptcp-mptcp_v0.94/net/mptcp/Kconfig
+ default "redundant" if DEFAULT_REDUNDANT
+ default "default"
+
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
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 2019-01-23 00:56:55.000000000 +0100
@@ -0,0 +1,22 @@
+#
+## Makefile for MultiPath TCP support code.
@ -6884,9 +6901,9 @@ diff -aurN linux-4.14.89/net/mptcp/Makefile mptcp-mptcp_v0.94/net/mptcp/Makefile
+
+mptcp-$(subst m,y,$(CONFIG_IPV6)) += mptcp_ipv6.o
+
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
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 2019-01-23 00:56:55.000000000 +0100
@@ -0,0 +1,268 @@
+/*
+ * MPTCP implementation - Balia Congestion Control
@ -7156,9 +7173,9 @@ diff -aurN linux-4.14.89/net/mptcp/mptcp_balia.c mptcp-mptcp_v0.94/net/mptcp/mpt
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("MPTCP BALIA CONGESTION CONTROL ALGORITHM");
+MODULE_VERSION("0.1");
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
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 2019-01-23 00:56:55.000000000 +0100
@@ -0,0 +1,486 @@
+#include <linux/module.h>
+
@ -7646,9 +7663,9 @@ diff -aurN linux-4.14.89/net/mptcp/mptcp_binder.c mptcp-mptcp_v0.94/net/mptcp/mp
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("BINDER MPTCP");
+MODULE_VERSION("0.1");
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
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 2019-01-23 00:56:55.000000000 +0100
@@ -0,0 +1,271 @@
+/*
+ * MPTCP implementation - Linked Increase congestion control Algorithm (LIA)
@ -7921,9 +7938,9 @@ diff -aurN linux-4.14.89/net/mptcp/mptcp_coupled.c mptcp-mptcp_v0.94/net/mptcp/m
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("MPTCP LINKED INCREASE CONGESTION CONTROL ALGORITHM");
+MODULE_VERSION("0.1");
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
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 2019-01-23 00:56:55.000000000 +0100
@@ -0,0 +1,2931 @@
+/*
+ * MPTCP implementation - MPTCP-control
@ -10827,7 +10844,7 @@ diff -aurN linux-4.14.89/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.94/net/mptcp/mptc
+ if (mptcp_register_scheduler(&mptcp_sched_default))
+ goto register_sched_failed;
+
+ pr_info("MPTCP: Stable release v0.94.1");
+ pr_info("MPTCP: Stable release v0.94.2");
+
+ mptcp_init_failed = false;
+
@ -10856,9 +10873,9 @@ diff -aurN linux-4.14.89/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.94/net/mptcp/mptc
+mptcp_sock_cache_failed:
+ mptcp_init_failed = true;
+}
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
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 2019-01-23 00:56:55.000000000 +0100
@@ -0,0 +1,2013 @@
+#include <linux/module.h>
+#include <linux/proc_fs.h>
@ -12873,9 +12890,9 @@ diff -aurN linux-4.14.89/net/mptcp/mptcp_fullmesh.c mptcp-mptcp_v0.94/net/mptcp/
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Full-Mesh MPTCP");
+MODULE_VERSION("0.88");
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
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 2019-01-23 00:56:55.000000000 +0100
@@ -0,0 +1,2466 @@
+/*
+ * MPTCP implementation - Sending side
@ -15343,9 +15360,9 @@ diff -aurN linux-4.14.89/net/mptcp/mptcp_input.c mptcp-mptcp_v0.94/net/mptcp/mpt
+ tcp_set_rto(sk);
+ mptcp_set_rto(sk);
+}
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
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 2019-01-23 00:56:55.000000000 +0100
@@ -0,0 +1,436 @@
+/*
+ * MPTCP implementation - IPv4-specific functions
@ -15783,9 +15800,9 @@ diff -aurN linux-4.14.89/net/mptcp/mptcp_ipv4.c mptcp-mptcp_v0.94/net/mptcp/mptc
+ kmem_cache_destroy(mptcp_request_sock_ops.slab);
+ kfree(mptcp_request_sock_ops.slab_name);
+}
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
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 2019-01-23 00:56:55.000000000 +0100
@@ -0,0 +1,465 @@
+/*
+ * MPTCP implementation - IPv6-specific functions
@ -16252,9 +16269,9 @@ diff -aurN linux-4.14.89/net/mptcp/mptcp_ipv6.c mptcp-mptcp_v0.94/net/mptcp/mptc
+ kmem_cache_destroy(mptcp6_request_sock_ops.slab);
+ kfree(mptcp6_request_sock_ops.slab_name);
+}
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
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 2019-01-23 00:56:55.000000000 +0100
@@ -0,0 +1,169 @@
+#include <linux/module.h>
+
@ -16425,9 +16442,9 @@ diff -aurN linux-4.14.89/net/mptcp/mptcp_ndiffports.c mptcp-mptcp_v0.94/net/mptc
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("NDIFF-PORTS MPTCP");
+MODULE_VERSION("0.88");
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
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 2019-01-23 00:56:55.000000000 +0100
@@ -0,0 +1,310 @@
+/*
+ * MPTCP implementation - OPPORTUNISTIC LINKED INCREASES CONGESTION CONTROL:
@ -16739,9 +16756,9 @@ diff -aurN linux-4.14.89/net/mptcp/mptcp_olia.c mptcp-mptcp_v0.94/net/mptcp/mptc
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("MPTCP COUPLED CONGESTION CONTROL");
+MODULE_VERSION("0.1");
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
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 2019-01-23 00:56:55.000000000 +0100
@@ -0,0 +1,1816 @@
+/*
+ * MPTCP implementation - Sending side
@ -18559,9 +18576,9 @@ diff -aurN linux-4.14.89/net/mptcp/mptcp_output.c mptcp-mptcp_v0.94/net/mptcp/mp
+ return max(xmit_size_goal, mss_now);
+}
+
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
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 2019-01-23 00:56:55.000000000 +0100
@@ -0,0 +1,226 @@
+/*
+ * MPTCP implementation - MPTCP-subflow-management
@ -18789,9 +18806,9 @@ diff -aurN linux-4.14.89/net/mptcp/mptcp_pm.c mptcp-mptcp_v0.94/net/mptcp/mptcp_
+ return mptcp_set_default_path_manager(CONFIG_DEFAULT_MPTCP_PM);
+}
+late_initcall(mptcp_path_manager_default);
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
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 2019-01-23 00:56:55.000000000 +0100
@@ -0,0 +1,301 @@
+/*
+ * MPTCP Scheduler to reduce latency and jitter.
@ -19094,9 +19111,9 @@ diff -aurN linux-4.14.89/net/mptcp/mptcp_redundant.c mptcp-mptcp_v0.94/net/mptcp
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("REDUNDANT MPTCP");
+MODULE_VERSION("0.90");
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
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 2019-01-23 00:56:55.000000000 +0100
@@ -0,0 +1,301 @@
+/* MPTCP Scheduler module selector. Highly inspired by tcp_cong.c */
+
@ -19399,9 +19416,9 @@ diff -aurN linux-4.14.89/net/mptcp/mptcp_rr.c mptcp-mptcp_v0.94/net/mptcp/mptcp_
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("ROUNDROBIN MPTCP");
+MODULE_VERSION("0.89");
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
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 2019-01-23 00:56:55.000000000 +0100
@@ -0,0 +1,634 @@
+/* MPTCP Scheduler module selector. Highly inspired by tcp_cong.c */
+
@ -20037,9 +20054,9 @@ diff -aurN linux-4.14.89/net/mptcp/mptcp_sched.c mptcp-mptcp_v0.94/net/mptcp/mpt
+ return mptcp_set_default_scheduler(CONFIG_DEFAULT_MPTCP_SCHED);
+}
+late_initcall(mptcp_scheduler_default);
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
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 2019-01-23 00:56:55.000000000 +0100
@@ -0,0 +1,270 @@
+/*
+ * MPTCP implementation - WEIGHTED VEGAS