mptcp/openmptcprouter
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter.git synced 2025-03-09 15:40:20 +00:00
Code Issues Releases Wiki Activity

Update MPTCP patches

Browse source
This commit is contained in:
Ycarus 2019-06-04 19:34:45 +02:00
parent 45bf50b536
commit 9bc82f701c
2 changed files with 266 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
diff -aurN linux-4.14.122/Documentation/networking/ip-sysctl.txt mptcp-mptcp_v0.94/Documentation/networking/ip-sysctl.txt diff -aurN linux-4.14.123/Documentation/networking/ip-sysctl.txt mptcp-mptcp_v0.94/Documentation/networking/ip-sysctl.txt
--- linux-4.14.122/Documentation/networking/ip-sysctl.txt 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/Documentation/networking/ip-sysctl.txt 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/Documentation/networking/ip-sysctl.txt 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/Documentation/networking/ip-sysctl.txt 2019-06-04 18:49:08.000000000 +0200
@@ -726,6 +726,18 @@ @@ -726,6 +726,18 @@
in RFC 5961 (Improving TCP's Robustness to Blind In-Window Attacks) in RFC 5961 (Improving TCP's Robustness to Blind In-Window Attacks)
Default: 100 Default: 100
@ -20,10 +20,10 @@ diff -aurN linux-4.14.122/Documentation/networking/ip-sysctl.txt mptcp-mptcp_v0.
UDP variables: UDP variables:
udp_l3mdev_accept - BOOLEAN udp_l3mdev_accept - BOOLEAN
diff -aurN linux-4.14.122/drivers/infiniband/hw/cxgb4/cm.c mptcp-mptcp_v0.94/drivers/infiniband/hw/cxgb4/cm.c diff -aurN linux-4.14.123/drivers/infiniband/hw/cxgb4/cm.c mptcp-mptcp_v0.94/drivers/infiniband/hw/cxgb4/cm.c
--- linux-4.14.122/drivers/infiniband/hw/cxgb4/cm.c 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/drivers/infiniband/hw/cxgb4/cm.c 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/drivers/infiniband/hw/cxgb4/cm.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/drivers/infiniband/hw/cxgb4/cm.c 2019-06-04 18:49:08.000000000 +0200
@@ -3753,7 +3753,7 @@ @@ -3755,7 +3755,7 @@
*/ */
memset(&tmp_opt, 0, sizeof(tmp_opt)); memset(&tmp_opt, 0, sizeof(tmp_opt));
tcp_clear_options(&tmp_opt); tcp_clear_options(&tmp_opt);
@ -32,9 +32,9 @@ diff -aurN linux-4.14.122/drivers/infiniband/hw/cxgb4/cm.c mptcp-mptcp_v0.94/dri
req = __skb_push(skb, sizeof(*req)); req = __skb_push(skb, sizeof(*req));
memset(req, 0, sizeof(*req)); memset(req, 0, sizeof(*req));
diff -aurN linux-4.14.122/include/linux/skbuff.h mptcp-mptcp_v0.94/include/linux/skbuff.h diff -aurN linux-4.14.123/include/linux/skbuff.h mptcp-mptcp_v0.94/include/linux/skbuff.h
--- linux-4.14.122/include/linux/skbuff.h 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/include/linux/skbuff.h 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/include/linux/skbuff.h 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/include/linux/skbuff.h 2019-06-04 18:49:08.000000000 +0200
@@ -690,7 +690,7 @@ @@ -690,7 +690,7 @@
* want to keep them across layers you have to do a skb_clone() * want to keep them across layers you have to do a skb_clone()
* first. This is owned by whoever has the skb queued ATM. * first. This is owned by whoever has the skb queued ATM.
@ -44,9 +44,9 @@ diff -aurN linux-4.14.122/include/linux/skbuff.h mptcp-mptcp_v0.94/include/linux
unsigned long _skb_refdst; unsigned long _skb_refdst;
void (*destructor)(struct sk_buff *skb); void (*destructor)(struct sk_buff *skb);
diff -aurN linux-4.14.122/include/linux/tcp.h mptcp-mptcp_v0.94/include/linux/tcp.h diff -aurN linux-4.14.123/include/linux/tcp.h mptcp-mptcp_v0.94/include/linux/tcp.h
--- linux-4.14.122/include/linux/tcp.h 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/include/linux/tcp.h 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/include/linux/tcp.h 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/include/linux/tcp.h 2019-06-04 18:49:08.000000000 +0200
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
/* TCP Fast Open */ /* TCP Fast Open */
#define TCP_FASTOPEN_COOKIE_MIN 4 /* Min Fast Open Cookie size in bytes */ #define TCP_FASTOPEN_COOKIE_MIN 4 /* Min Fast Open Cookie size in bytes */
@ -203,9 +203,9 @@ diff -aurN linux-4.14.122/include/linux/tcp.h mptcp-mptcp_v0.94/include/linux/tc
}; };
static inline struct tcp_timewait_sock *tcp_twsk(const struct sock *sk) static inline struct tcp_timewait_sock *tcp_twsk(const struct sock *sk)
diff -aurN linux-4.14.122/include/net/inet_common.h mptcp-mptcp_v0.94/include/net/inet_common.h diff -aurN linux-4.14.123/include/net/inet_common.h mptcp-mptcp_v0.94/include/net/inet_common.h
--- linux-4.14.122/include/net/inet_common.h 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/include/net/inet_common.h 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/include/net/inet_common.h 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/include/net/inet_common.h 2019-06-04 18:49:08.000000000 +0200
@@ -2,6 +2,8 @@ @@ -2,6 +2,8 @@
#ifndef _INET_COMMON_H #ifndef _INET_COMMON_H
#define _INET_COMMON_H #define _INET_COMMON_H
@ -224,9 +224,9 @@ diff -aurN linux-4.14.122/include/net/inet_common.h mptcp-mptcp_v0.94/include/ne
int inet_release(struct socket *sock); int inet_release(struct socket *sock);
int inet_stream_connect(struct socket *sock, struct sockaddr *uaddr, int inet_stream_connect(struct socket *sock, struct sockaddr *uaddr,
int addr_len, int flags); int addr_len, int flags);
diff -aurN linux-4.14.122/include/net/inet_connection_sock.h mptcp-mptcp_v0.94/include/net/inet_connection_sock.h diff -aurN linux-4.14.123/include/net/inet_connection_sock.h mptcp-mptcp_v0.94/include/net/inet_connection_sock.h
--- linux-4.14.122/include/net/inet_connection_sock.h 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/include/net/inet_connection_sock.h 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/include/net/inet_connection_sock.h 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/include/net/inet_connection_sock.h 2019-06-04 18:49:08.000000000 +0200
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
struct inet_bind_bucket; struct inet_bind_bucket;
@ -235,9 +235,9 @@ diff -aurN linux-4.14.122/include/net/inet_connection_sock.h mptcp-mptcp_v0.94/i
/* /*
* Pointers to address related TCP functions * Pointers to address related TCP functions
diff -aurN linux-4.14.122/include/net/inet_sock.h mptcp-mptcp_v0.94/include/net/inet_sock.h diff -aurN linux-4.14.123/include/net/inet_sock.h mptcp-mptcp_v0.94/include/net/inet_sock.h
--- linux-4.14.122/include/net/inet_sock.h 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/include/net/inet_sock.h 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/include/net/inet_sock.h 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/include/net/inet_sock.h 2019-06-04 18:49:08.000000000 +0200
@@ -90,7 +90,9 @@ @@ -90,7 +90,9 @@
wscale_ok : 1, wscale_ok : 1,
ecn_ok : 1, ecn_ok : 1,
@ -249,9 +249,9 @@ diff -aurN linux-4.14.122/include/net/inet_sock.h mptcp-mptcp_v0.94/include/net/
u32 ir_mark; u32 ir_mark;
union { union {
struct ip_options_rcu __rcu *ireq_opt; struct ip_options_rcu __rcu *ireq_opt;
diff -aurN linux-4.14.122/include/net/mptcp.h mptcp-mptcp_v0.94/include/net/mptcp.h diff -aurN linux-4.14.123/include/net/mptcp.h mptcp-mptcp_v0.94/include/net/mptcp.h
--- linux-4.14.122/include/net/mptcp.h 1970-01-01 01:00:00.000000000 +0100 --- linux-4.14.123/include/net/mptcp.h 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.94/include/net/mptcp.h 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/include/net/mptcp.h 2019-06-04 18:49:08.000000000 +0200
@@ -0,0 +1,1521 @@ @@ -0,0 +1,1521 @@
+/* +/*
+ * MPTCP implementation + * MPTCP implementation
@ -1774,9 +1774,9 @@ diff -aurN linux-4.14.122/include/net/mptcp.h mptcp-mptcp_v0.94/include/net/mptc
+#endif /* CONFIG_MPTCP */ +#endif /* CONFIG_MPTCP */
+ +
+#endif /* _MPTCP_H */ +#endif /* _MPTCP_H */
diff -aurN linux-4.14.122/include/net/mptcp_v4.h mptcp-mptcp_v0.94/include/net/mptcp_v4.h diff -aurN linux-4.14.123/include/net/mptcp_v4.h mptcp-mptcp_v0.94/include/net/mptcp_v4.h
--- linux-4.14.122/include/net/mptcp_v4.h 1970-01-01 01:00:00.000000000 +0100 --- linux-4.14.123/include/net/mptcp_v4.h 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.94/include/net/mptcp_v4.h 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/include/net/mptcp_v4.h 2019-06-04 18:49:08.000000000 +0200
@@ -0,0 +1,68 @@ @@ -0,0 +1,68 @@
+/* +/*
+ * MPTCP implementation + * MPTCP implementation
@ -1846,9 +1846,9 @@ diff -aurN linux-4.14.122/include/net/mptcp_v4.h mptcp-mptcp_v0.94/include/net/m
+#endif /* CONFIG_MPTCP */ +#endif /* CONFIG_MPTCP */
+ +
+#endif /* MPTCP_V4_H_ */ +#endif /* MPTCP_V4_H_ */
diff -aurN linux-4.14.122/include/net/mptcp_v6.h mptcp-mptcp_v0.94/include/net/mptcp_v6.h diff -aurN linux-4.14.123/include/net/mptcp_v6.h mptcp-mptcp_v0.94/include/net/mptcp_v6.h
--- linux-4.14.122/include/net/mptcp_v6.h 1970-01-01 01:00:00.000000000 +0100 --- linux-4.14.123/include/net/mptcp_v6.h 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.94/include/net/mptcp_v6.h 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/include/net/mptcp_v6.h 2019-06-04 18:49:08.000000000 +0200
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
+/* +/*
+ * MPTCP implementation + * MPTCP implementation
@ -1919,9 +1919,9 @@ diff -aurN linux-4.14.122/include/net/mptcp_v6.h mptcp-mptcp_v0.94/include/net/m
+#endif /* CONFIG_MPTCP */ +#endif /* CONFIG_MPTCP */
+ +
+#endif /* _MPTCP_V6_H */ +#endif /* _MPTCP_V6_H */
diff -aurN linux-4.14.122/include/net/net_namespace.h mptcp-mptcp_v0.94/include/net/net_namespace.h diff -aurN linux-4.14.123/include/net/net_namespace.h mptcp-mptcp_v0.94/include/net/net_namespace.h
--- linux-4.14.122/include/net/net_namespace.h 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/include/net/net_namespace.h 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/include/net/net_namespace.h 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/include/net/net_namespace.h 2019-06-04 18:49:08.000000000 +0200
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
#include <net/netns/packet.h> #include <net/netns/packet.h>
#include <net/netns/ipv4.h> #include <net/netns/ipv4.h>
@ -1940,9 +1940,9 @@ diff -aurN linux-4.14.122/include/net/net_namespace.h mptcp-mptcp_v0.94/include/
#if IS_ENABLED(CONFIG_IEEE802154_6LOWPAN) #if IS_ENABLED(CONFIG_IEEE802154_6LOWPAN)
struct netns_ieee802154_lowpan ieee802154_lowpan; struct netns_ieee802154_lowpan ieee802154_lowpan;
#endif #endif
diff -aurN linux-4.14.122/include/net/netns/mptcp.h mptcp-mptcp_v0.94/include/net/netns/mptcp.h diff -aurN linux-4.14.123/include/net/netns/mptcp.h mptcp-mptcp_v0.94/include/net/netns/mptcp.h
--- linux-4.14.122/include/net/netns/mptcp.h 1970-01-01 01:00:00.000000000 +0100 --- linux-4.14.123/include/net/netns/mptcp.h 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.94/include/net/netns/mptcp.h 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/include/net/netns/mptcp.h 2019-06-04 18:49:08.000000000 +0200
@@ -0,0 +1,52 @@ @@ -0,0 +1,52 @@
+/* +/*
+ * MPTCP implementation - MPTCP namespace + * MPTCP implementation - MPTCP namespace
@ -1996,9 +1996,9 @@ diff -aurN linux-4.14.122/include/net/netns/mptcp.h mptcp-mptcp_v0.94/include/ne
+}; +};
+ +
+#endif /* __NETNS_MPTCP_H__ */ +#endif /* __NETNS_MPTCP_H__ */
diff -aurN linux-4.14.122/include/net/snmp.h mptcp-mptcp_v0.94/include/net/snmp.h diff -aurN linux-4.14.123/include/net/snmp.h mptcp-mptcp_v0.94/include/net/snmp.h
--- linux-4.14.122/include/net/snmp.h 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/include/net/snmp.h 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/include/net/snmp.h 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/include/net/snmp.h 2019-06-04 18:49:08.000000000 +0200
@@ -91,7 +91,6 @@ @@ -91,7 +91,6 @@
atomic_long_t mibs[ICMP6MSG_MIB_MAX]; atomic_long_t mibs[ICMP6MSG_MIB_MAX];
}; };
@ -2007,9 +2007,9 @@ diff -aurN linux-4.14.122/include/net/snmp.h mptcp-mptcp_v0.94/include/net/snmp.
/* TCP */ /* TCP */
#define TCP_MIB_MAX __TCP_MIB_MAX #define TCP_MIB_MAX __TCP_MIB_MAX
struct tcp_mib { struct tcp_mib {
diff -aurN linux-4.14.122/include/net/sock.h mptcp-mptcp_v0.94/include/net/sock.h diff -aurN linux-4.14.123/include/net/sock.h mptcp-mptcp_v0.94/include/net/sock.h
--- linux-4.14.122/include/net/sock.h 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/include/net/sock.h 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/include/net/sock.h 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/include/net/sock.h 2019-06-04 18:49:08.000000000 +0200
@@ -781,6 +781,7 @@ @@ -781,6 +781,7 @@
SOCK_FILTER_LOCKED, /* Filter cannot be changed anymore */ SOCK_FILTER_LOCKED, /* Filter cannot be changed anymore */
SOCK_SELECT_ERR_QUEUE, /* Wake select on error queue */ SOCK_SELECT_ERR_QUEUE, /* Wake select on error queue */
@ -2036,9 +2036,9 @@ diff -aurN linux-4.14.122/include/net/sock.h mptcp-mptcp_v0.94/include/net/sock.
} }
static inline bool sock_owned_by_user(const struct sock *sk) static inline bool sock_owned_by_user(const struct sock *sk)
diff -aurN linux-4.14.122/include/net/tcp.h mptcp-mptcp_v0.94/include/net/tcp.h diff -aurN linux-4.14.123/include/net/tcp.h mptcp-mptcp_v0.94/include/net/tcp.h
--- linux-4.14.122/include/net/tcp.h 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/include/net/tcp.h 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/include/net/tcp.h 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/include/net/tcp.h 2019-06-04 18:49:08.000000000 +0200
@@ -185,6 +185,7 @@ @@ -185,6 +185,7 @@
#define TCPOPT_SACK 5 /* SACK Block */ #define TCPOPT_SACK 5 /* SACK Block */
#define TCPOPT_TIMESTAMP 8 /* Better RTT estimations/PAWS */ #define TCPOPT_TIMESTAMP 8 /* Better RTT estimations/PAWS */
@ -2389,9 +2389,9 @@ diff -aurN linux-4.14.122/include/net/tcp.h mptcp-mptcp_v0.94/include/net/tcp.h
const struct sock *sk, struct sk_buff *skb, const struct sock *sk, struct sk_buff *skb,
__u16 *mss) __u16 *mss)
{ {
diff -aurN linux-4.14.122/include/net/tcp_states.h mptcp-mptcp_v0.94/include/net/tcp_states.h diff -aurN linux-4.14.123/include/net/tcp_states.h mptcp-mptcp_v0.94/include/net/tcp_states.h
--- linux-4.14.122/include/net/tcp_states.h 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/include/net/tcp_states.h 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/include/net/tcp_states.h 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/include/net/tcp_states.h 2019-06-04 18:49:08.000000000 +0200
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
TCP_LISTEN, TCP_LISTEN,
TCP_CLOSING, /* Now a valid state */ TCP_CLOSING, /* Now a valid state */
@ -2408,9 +2408,9 @@ diff -aurN linux-4.14.122/include/net/tcp_states.h mptcp-mptcp_v0.94/include/net
}; };
#endif /* _LINUX_TCP_STATES_H */ #endif /* _LINUX_TCP_STATES_H */
diff -aurN linux-4.14.122/include/net/transp_v6.h mptcp-mptcp_v0.94/include/net/transp_v6.h diff -aurN linux-4.14.123/include/net/transp_v6.h mptcp-mptcp_v0.94/include/net/transp_v6.h
--- linux-4.14.122/include/net/transp_v6.h 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/include/net/transp_v6.h 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/include/net/transp_v6.h 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/include/net/transp_v6.h 2019-06-04 18:49:08.000000000 +0200
@@ -59,6 +59,8 @@ @@ -59,6 +59,8 @@
/* address family specific functions */ /* address family specific functions */
@ -2420,9 +2420,9 @@ diff -aurN linux-4.14.122/include/net/transp_v6.h mptcp-mptcp_v0.94/include/net/
void inet6_destroy_sock(struct sock *sk); void inet6_destroy_sock(struct sock *sk);
diff -aurN linux-4.14.122/include/uapi/linux/if.h mptcp-mptcp_v0.94/include/uapi/linux/if.h diff -aurN linux-4.14.123/include/uapi/linux/if.h mptcp-mptcp_v0.94/include/uapi/linux/if.h
--- linux-4.14.122/include/uapi/linux/if.h 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/include/uapi/linux/if.h 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/include/uapi/linux/if.h 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/include/uapi/linux/if.h 2019-06-04 18:49:08.000000000 +0200
@@ -132,6 +132,9 @@ @@ -132,6 +132,9 @@
#define IFF_ECHO IFF_ECHO #define IFF_ECHO IFF_ECHO
#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
@ -2433,9 +2433,9 @@ diff -aurN linux-4.14.122/include/uapi/linux/if.h mptcp-mptcp_v0.94/include/uapi
#define IFF_VOLATILE (IFF_LOOPBACK|IFF_POINTOPOINT|IFF_BROADCAST|IFF_ECHO|\ #define IFF_VOLATILE (IFF_LOOPBACK|IFF_POINTOPOINT|IFF_BROADCAST|IFF_ECHO|\
IFF_MASTER|IFF_SLAVE|IFF_RUNNING|IFF_LOWER_UP|IFF_DORMANT) IFF_MASTER|IFF_SLAVE|IFF_RUNNING|IFF_LOWER_UP|IFF_DORMANT)
diff -aurN linux-4.14.122/include/uapi/linux/tcp.h mptcp-mptcp_v0.94/include/uapi/linux/tcp.h diff -aurN linux-4.14.123/include/uapi/linux/tcp.h mptcp-mptcp_v0.94/include/uapi/linux/tcp.h
--- linux-4.14.122/include/uapi/linux/tcp.h 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/include/uapi/linux/tcp.h 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/include/uapi/linux/tcp.h 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/include/uapi/linux/tcp.h 2019-06-04 18:49:08.000000000 +0200
@@ -18,9 +18,15 @@ @@ -18,9 +18,15 @@
#ifndef _UAPI_LINUX_TCP_H #ifndef _UAPI_LINUX_TCP_H
#define _UAPI_LINUX_TCP_H #define _UAPI_LINUX_TCP_H
@ -2520,9 +2520,9 @@ diff -aurN linux-4.14.122/include/uapi/linux/tcp.h mptcp-mptcp_v0.94/include/uap
/* for TCP_MD5SIG socket option */ /* for TCP_MD5SIG socket option */
#define TCP_MD5SIG_MAXKEYLEN 80 #define TCP_MD5SIG_MAXKEYLEN 80
diff -aurN linux-4.14.122/kernel/rcu/Kconfig.debug mptcp-mptcp_v0.94/kernel/rcu/Kconfig.debug diff -aurN linux-4.14.123/kernel/rcu/Kconfig.debug mptcp-mptcp_v0.94/kernel/rcu/Kconfig.debug
--- linux-4.14.122/kernel/rcu/Kconfig.debug 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/kernel/rcu/Kconfig.debug 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/kernel/rcu/Kconfig.debug 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/kernel/rcu/Kconfig.debug 2019-06-04 18:49:08.000000000 +0200
@@ -4,9 +4,6 @@ @@ -4,9 +4,6 @@
menu "RCU Debugging" menu "RCU Debugging"
@ -2533,9 +2533,9 @@ diff -aurN linux-4.14.122/kernel/rcu/Kconfig.debug mptcp-mptcp_v0.94/kernel/rcu/
config TORTURE_TEST config TORTURE_TEST
tristate tristate
default n default n
diff -aurN linux-4.14.122/net/core/dev.c mptcp-mptcp_v0.94/net/core/dev.c diff -aurN linux-4.14.123/net/core/dev.c mptcp-mptcp_v0.94/net/core/dev.c
--- linux-4.14.122/net/core/dev.c 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/net/core/dev.c 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/net/core/dev.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/core/dev.c 2019-06-04 18:49:08.000000000 +0200
@@ -6769,7 +6769,7 @@ @@ -6769,7 +6769,7 @@
dev->flags = (flags & (IFF_DEBUG | IFF_NOTRAILERS | IFF_NOARP | dev->flags = (flags & (IFF_DEBUG | IFF_NOTRAILERS | IFF_NOARP |
@ -2545,9 +2545,9 @@ diff -aurN linux-4.14.122/net/core/dev.c mptcp-mptcp_v0.94/net/core/dev.c
(dev->flags & (IFF_UP | IFF_VOLATILE | IFF_PROMISC | (dev->flags & (IFF_UP | IFF_VOLATILE | IFF_PROMISC |
IFF_ALLMULTI)); IFF_ALLMULTI));
diff -aurN linux-4.14.122/net/core/skbuff.c mptcp-mptcp_v0.94/net/core/skbuff.c diff -aurN linux-4.14.123/net/core/skbuff.c mptcp-mptcp_v0.94/net/core/skbuff.c
--- linux-4.14.122/net/core/skbuff.c 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/net/core/skbuff.c 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/net/core/skbuff.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/core/skbuff.c 2019-06-04 18:49:08.000000000 +0200
@@ -536,7 +536,7 @@ @@ -536,7 +536,7 @@
skb_drop_list(&skb_shinfo(skb)->frag_list); skb_drop_list(&skb_shinfo(skb)->frag_list);
} }
@ -2566,9 +2566,9 @@ diff -aurN linux-4.14.122/net/core/skbuff.c mptcp-mptcp_v0.94/net/core/skbuff.c
{ {
__copy_skb_header(new, old); __copy_skb_header(new, old);
diff -aurN linux-4.14.122/net/core/sock.c mptcp-mptcp_v0.94/net/core/sock.c diff -aurN linux-4.14.123/net/core/sock.c mptcp-mptcp_v0.94/net/core/sock.c
--- linux-4.14.122/net/core/sock.c 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/net/core/sock.c 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/net/core/sock.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/core/sock.c 2019-06-04 18:49:08.000000000 +0200
@@ -139,6 +139,11 @@ @@ -139,6 +139,11 @@
#include <trace/events/sock.h> #include <trace/events/sock.h>
@ -2628,9 +2628,9 @@ diff -aurN linux-4.14.122/net/core/sock.c mptcp-mptcp_v0.94/net/core/sock.c
mem_cgroup_sk_alloc(newsk); mem_cgroup_sk_alloc(newsk);
cgroup_sk_alloc(&newsk->sk_cgrp_data); cgroup_sk_alloc(&newsk->sk_cgrp_data);
diff -aurN linux-4.14.122/net/ipv4/af_inet.c mptcp-mptcp_v0.94/net/ipv4/af_inet.c diff -aurN linux-4.14.123/net/ipv4/af_inet.c mptcp-mptcp_v0.94/net/ipv4/af_inet.c
--- linux-4.14.122/net/ipv4/af_inet.c 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/net/ipv4/af_inet.c 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/net/ipv4/af_inet.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/ipv4/af_inet.c 2019-06-04 18:49:08.000000000 +0200
@@ -104,6 +104,7 @@ @@ -104,6 +104,7 @@
#include <net/ip_fib.h> #include <net/ip_fib.h>
#include <net/inet_connection_sock.h> #include <net/inet_connection_sock.h>
@ -2693,9 +2693,9 @@ diff -aurN linux-4.14.122/net/ipv4/af_inet.c mptcp-mptcp_v0.94/net/ipv4/af_inet.
/* Setup TCP slab cache for open requests. */ /* Setup TCP slab cache for open requests. */
tcp_init(); tcp_init();
diff -aurN linux-4.14.122/net/ipv4/inet_connection_sock.c mptcp-mptcp_v0.94/net/ipv4/inet_connection_sock.c diff -aurN linux-4.14.123/net/ipv4/inet_connection_sock.c mptcp-mptcp_v0.94/net/ipv4/inet_connection_sock.c
--- linux-4.14.122/net/ipv4/inet_connection_sock.c 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/net/ipv4/inet_connection_sock.c 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/net/ipv4/inet_connection_sock.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/ipv4/inet_connection_sock.c 2019-06-04 18:49:08.000000000 +0200
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
#include <net/route.h> #include <net/route.h>
#include <net/tcp_states.h> #include <net/tcp_states.h>
@ -2753,9 +2753,9 @@ diff -aurN linux-4.14.122/net/ipv4/inet_connection_sock.c mptcp-mptcp_v0.94/net/
sock_put(child); sock_put(child);
cond_resched(); cond_resched();
diff -aurN linux-4.14.122/net/ipv4/ip_sockglue.c mptcp-mptcp_v0.94/net/ipv4/ip_sockglue.c diff -aurN linux-4.14.123/net/ipv4/ip_sockglue.c mptcp-mptcp_v0.94/net/ipv4/ip_sockglue.c
--- linux-4.14.122/net/ipv4/ip_sockglue.c 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/net/ipv4/ip_sockglue.c 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/net/ipv4/ip_sockglue.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/ipv4/ip_sockglue.c 2019-06-04 18:49:08.000000000 +0200
@@ -44,6 +44,8 @@ @@ -44,6 +44,8 @@
#endif #endif
#include <net/ip_fib.h> #include <net/ip_fib.h>
@ -2792,9 +2792,9 @@ diff -aurN linux-4.14.122/net/ipv4/ip_sockglue.c mptcp-mptcp_v0.94/net/ipv4/ip_s
} }
break; break;
case IP_TTL: case IP_TTL:
diff -aurN linux-4.14.122/net/ipv4/Kconfig mptcp-mptcp_v0.94/net/ipv4/Kconfig diff -aurN linux-4.14.123/net/ipv4/Kconfig mptcp-mptcp_v0.94/net/ipv4/Kconfig
--- linux-4.14.122/net/ipv4/Kconfig 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/net/ipv4/Kconfig 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/net/ipv4/Kconfig 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/ipv4/Kconfig 2019-06-04 18:49:08.000000000 +0200
@@ -675,6 +675,38 @@ @@ -675,6 +675,38 @@
bufferbloat, policers, or AQM schemes that do not provide a delay bufferbloat, policers, or AQM schemes that do not provide a delay
signal. It requires the fq ("Fair Queue") pacing packet scheduler. signal. It requires the fq ("Fair Queue") pacing packet scheduler.
@ -2864,9 +2864,9 @@ diff -aurN linux-4.14.122/net/ipv4/Kconfig mptcp-mptcp_v0.94/net/ipv4/Kconfig
default "reno" if DEFAULT_RENO default "reno" if DEFAULT_RENO
default "dctcp" if DEFAULT_DCTCP default "dctcp" if DEFAULT_DCTCP
default "cdg" if DEFAULT_CDG default "cdg" if DEFAULT_CDG
diff -aurN linux-4.14.122/net/ipv4/syncookies.c mptcp-mptcp_v0.94/net/ipv4/syncookies.c diff -aurN linux-4.14.123/net/ipv4/syncookies.c mptcp-mptcp_v0.94/net/ipv4/syncookies.c
--- linux-4.14.122/net/ipv4/syncookies.c 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/net/ipv4/syncookies.c 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/net/ipv4/syncookies.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/ipv4/syncookies.c 2019-06-04 18:49:08.000000000 +0200
@@ -16,6 +16,8 @@ @@ -16,6 +16,8 @@
#include <linux/siphash.h> #include <linux/siphash.h>
#include <linux/kernel.h> #include <linux/kernel.h>
@ -2979,9 +2979,9 @@ diff -aurN linux-4.14.122/net/ipv4/syncookies.c mptcp-mptcp_v0.94/net/ipv4/synco
ireq->rcv_wscale = rcv_wscale; ireq->rcv_wscale = rcv_wscale;
ireq->ecn_ok = cookie_ecn_ok(&tcp_opt, sock_net(sk), &rt->dst); ireq->ecn_ok = cookie_ecn_ok(&tcp_opt, sock_net(sk), &rt->dst);
diff -aurN linux-4.14.122/net/ipv4/tcp.c mptcp-mptcp_v0.94/net/ipv4/tcp.c diff -aurN linux-4.14.123/net/ipv4/tcp.c mptcp-mptcp_v0.94/net/ipv4/tcp.c
--- linux-4.14.122/net/ipv4/tcp.c 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/net/ipv4/tcp.c 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/net/ipv4/tcp.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/ipv4/tcp.c 2019-06-04 18:49:08.000000000 +0200
@@ -273,6 +273,7 @@ @@ -273,6 +273,7 @@
#include <net/icmp.h> #include <net/icmp.h>
@ -3688,9 +3688,9 @@ diff -aurN linux-4.14.122/net/ipv4/tcp.c mptcp-mptcp_v0.94/net/ipv4/tcp.c
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(tcp_abort); EXPORT_SYMBOL_GPL(tcp_abort);
diff -aurN linux-4.14.122/net/ipv4/tcp_diag.c mptcp-mptcp_v0.94/net/ipv4/tcp_diag.c diff -aurN linux-4.14.123/net/ipv4/tcp_diag.c mptcp-mptcp_v0.94/net/ipv4/tcp_diag.c
--- linux-4.14.122/net/ipv4/tcp_diag.c 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/net/ipv4/tcp_diag.c 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/net/ipv4/tcp_diag.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/ipv4/tcp_diag.c 2019-06-04 18:49:08.000000000 +0200
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
r->idiag_wqueue = tp->write_seq - tp->snd_una; r->idiag_wqueue = tp->write_seq - tp->snd_una;
} }
@ -3700,9 +3700,9 @@ diff -aurN linux-4.14.122/net/ipv4/tcp_diag.c mptcp-mptcp_v0.94/net/ipv4/tcp_dia
} }
#ifdef CONFIG_TCP_MD5SIG #ifdef CONFIG_TCP_MD5SIG
diff -aurN linux-4.14.122/net/ipv4/tcp_fastopen.c mptcp-mptcp_v0.94/net/ipv4/tcp_fastopen.c diff -aurN linux-4.14.123/net/ipv4/tcp_fastopen.c mptcp-mptcp_v0.94/net/ipv4/tcp_fastopen.c
--- linux-4.14.122/net/ipv4/tcp_fastopen.c 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/net/ipv4/tcp_fastopen.c 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/net/ipv4/tcp_fastopen.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/ipv4/tcp_fastopen.c 2019-06-04 18:49:08.000000000 +0200
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
#include <linux/rculist.h> #include <linux/rculist.h>
#include <net/inetpeer.h> #include <net/inetpeer.h>
@ -3761,9 +3761,9 @@ diff -aurN linux-4.14.122/net/ipv4/tcp_fastopen.c mptcp-mptcp_v0.94/net/ipv4/tcp
/* tcp_conn_request() is sending the SYNACK, /* tcp_conn_request() is sending the SYNACK,
* and queues the child into listener accept queue. * and queues the child into listener accept queue.
*/ */
diff -aurN linux-4.14.122/net/ipv4/tcp_input.c mptcp-mptcp_v0.94/net/ipv4/tcp_input.c diff -aurN linux-4.14.123/net/ipv4/tcp_input.c mptcp-mptcp_v0.94/net/ipv4/tcp_input.c
--- linux-4.14.122/net/ipv4/tcp_input.c 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/net/ipv4/tcp_input.c 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/net/ipv4/tcp_input.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/ipv4/tcp_input.c 2019-06-04 18:49:08.000000000 +0200
@@ -76,6 +76,9 @@ @@ -76,6 +76,9 @@
#include <linux/ipsec.h> #include <linux/ipsec.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
@ -4626,9 +4626,9 @@ diff -aurN linux-4.14.122/net/ipv4/tcp_input.c mptcp-mptcp_v0.94/net/ipv4/tcp_in
sock_put(fastopen_sk); sock_put(fastopen_sk);
} else { } else {
tcp_rsk(req)->tfo_listener = false; tcp_rsk(req)->tfo_listener = false;
diff -aurN linux-4.14.122/net/ipv4/tcp_ipv4.c mptcp-mptcp_v0.94/net/ipv4/tcp_ipv4.c diff -aurN linux-4.14.123/net/ipv4/tcp_ipv4.c mptcp-mptcp_v0.94/net/ipv4/tcp_ipv4.c
--- linux-4.14.122/net/ipv4/tcp_ipv4.c 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/net/ipv4/tcp_ipv4.c 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/net/ipv4/tcp_ipv4.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/ipv4/tcp_ipv4.c 2019-06-04 18:49:08.000000000 +0200
@@ -67,6 +67,8 @@ @@ -67,6 +67,8 @@
#include <net/icmp.h> #include <net/icmp.h>
#include <net/inet_hashtables.h> #include <net/inet_hashtables.h>
@ -5116,9 +5116,9 @@ diff -aurN linux-4.14.122/net/ipv4/tcp_ipv4.c mptcp-mptcp_v0.94/net/ipv4/tcp_ipv
}; };
EXPORT_SYMBOL(tcp_prot); EXPORT_SYMBOL(tcp_prot);
diff -aurN linux-4.14.122/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.94/net/ipv4/tcp_minisocks.c diff -aurN linux-4.14.123/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.94/net/ipv4/tcp_minisocks.c
--- linux-4.14.122/net/ipv4/tcp_minisocks.c 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/net/ipv4/tcp_minisocks.c 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/net/ipv4/tcp_minisocks.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/ipv4/tcp_minisocks.c 2019-06-04 18:49:08.000000000 +0200
@@ -18,11 +18,13 @@ @@ -18,11 +18,13 @@
* Jorge Cwik, <jorge@laser.satlink.net> * Jorge Cwik, <jorge@laser.satlink.net>
*/ */
@ -5329,9 +5329,9 @@ diff -aurN linux-4.14.122/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.94/net/ipv4/tc
sock_put(child); sock_put(child);
return ret; return ret;
} }
diff -aurN linux-4.14.122/net/ipv4/tcp_output.c mptcp-mptcp_v0.94/net/ipv4/tcp_output.c diff -aurN linux-4.14.123/net/ipv4/tcp_output.c mptcp-mptcp_v0.94/net/ipv4/tcp_output.c
--- linux-4.14.122/net/ipv4/tcp_output.c 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/net/ipv4/tcp_output.c 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/net/ipv4/tcp_output.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/ipv4/tcp_output.c 2019-06-04 18:49:08.000000000 +0200
@@ -36,6 +36,12 @@ @@ -36,6 +36,12 @@
#define pr_fmt(fmt) "TCP: " fmt #define pr_fmt(fmt) "TCP: " fmt
@ -5956,9 +5956,9 @@ diff -aurN linux-4.14.122/net/ipv4/tcp_output.c mptcp-mptcp_v0.94/net/ipv4/tcp_o
if (tp->packets_out || !tcp_send_head(sk)) { if (tp->packets_out || !tcp_send_head(sk)) {
/* Cancel probe timer, if it is not required. */ /* Cancel probe timer, if it is not required. */
diff -aurN linux-4.14.122/net/ipv4/tcp_timer.c mptcp-mptcp_v0.94/net/ipv4/tcp_timer.c diff -aurN linux-4.14.123/net/ipv4/tcp_timer.c mptcp-mptcp_v0.94/net/ipv4/tcp_timer.c
--- linux-4.14.122/net/ipv4/tcp_timer.c 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/net/ipv4/tcp_timer.c 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/net/ipv4/tcp_timer.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/ipv4/tcp_timer.c 2019-06-04 18:49:08.000000000 +0200
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
#include <linux/module.h> #include <linux/module.h>
@ -6173,9 +6173,9 @@ diff -aurN linux-4.14.122/net/ipv4/tcp_timer.c mptcp-mptcp_v0.94/net/ipv4/tcp_ti
sock_put(sk); sock_put(sk);
} }
diff -aurN linux-4.14.122/net/ipv6/addrconf.c mptcp-mptcp_v0.94/net/ipv6/addrconf.c diff -aurN linux-4.14.123/net/ipv6/addrconf.c mptcp-mptcp_v0.94/net/ipv6/addrconf.c
--- linux-4.14.122/net/ipv6/addrconf.c 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/net/ipv6/addrconf.c 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/net/ipv6/addrconf.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/ipv6/addrconf.c 2019-06-04 18:49:08.000000000 +0200
@@ -928,6 +928,7 @@ @@ -928,6 +928,7 @@
kfree_rcu(ifp, rcu); kfree_rcu(ifp, rcu);
@ -6184,9 +6184,9 @@ diff -aurN linux-4.14.122/net/ipv6/addrconf.c mptcp-mptcp_v0.94/net/ipv6/addrcon
static void static void
ipv6_link_dev_addr(struct inet6_dev *idev, struct inet6_ifaddr *ifp) ipv6_link_dev_addr(struct inet6_dev *idev, struct inet6_ifaddr *ifp)
diff -aurN linux-4.14.122/net/ipv6/af_inet6.c mptcp-mptcp_v0.94/net/ipv6/af_inet6.c diff -aurN linux-4.14.123/net/ipv6/af_inet6.c mptcp-mptcp_v0.94/net/ipv6/af_inet6.c
--- linux-4.14.122/net/ipv6/af_inet6.c 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/net/ipv6/af_inet6.c 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/net/ipv6/af_inet6.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/ipv6/af_inet6.c 2019-06-04 18:49:08.000000000 +0200
@@ -107,8 +107,7 @@ @@ -107,8 +107,7 @@
return (struct ipv6_pinfo *)(((u8 *)sk) + offset); return (struct ipv6_pinfo *)(((u8 *)sk) + offset);
} }
@ -6197,9 +6197,9 @@ diff -aurN linux-4.14.122/net/ipv6/af_inet6.c mptcp-mptcp_v0.94/net/ipv6/af_inet
{ {
struct inet_sock *inet; struct inet_sock *inet;
struct ipv6_pinfo *np; struct ipv6_pinfo *np;
diff -aurN linux-4.14.122/net/ipv6/ipv6_sockglue.c mptcp-mptcp_v0.94/net/ipv6/ipv6_sockglue.c diff -aurN linux-4.14.123/net/ipv6/ipv6_sockglue.c mptcp-mptcp_v0.94/net/ipv6/ipv6_sockglue.c
--- linux-4.14.122/net/ipv6/ipv6_sockglue.c 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/net/ipv6/ipv6_sockglue.c 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/net/ipv6/ipv6_sockglue.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/ipv6/ipv6_sockglue.c 2019-06-04 18:49:08.000000000 +0200
@@ -48,6 +48,8 @@ @@ -48,6 +48,8 @@
#include <net/addrconf.h> #include <net/addrconf.h>
#include <net/inet_common.h> #include <net/inet_common.h>
@ -6223,9 +6223,9 @@ diff -aurN linux-4.14.122/net/ipv6/ipv6_sockglue.c mptcp-mptcp_v0.94/net/ipv6/ip
sk->sk_socket->ops = &inet_stream_ops; sk->sk_socket->ops = &inet_stream_ops;
sk->sk_family = PF_INET; sk->sk_family = PF_INET;
tcp_sync_mss(sk, icsk->icsk_pmtu_cookie); tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);
diff -aurN linux-4.14.122/net/ipv6/syncookies.c mptcp-mptcp_v0.94/net/ipv6/syncookies.c diff -aurN linux-4.14.123/net/ipv6/syncookies.c mptcp-mptcp_v0.94/net/ipv6/syncookies.c
--- linux-4.14.122/net/ipv6/syncookies.c 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/net/ipv6/syncookies.c 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/net/ipv6/syncookies.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/ipv6/syncookies.c 2019-06-04 18:49:08.000000000 +0200
@@ -20,6 +20,8 @@ @@ -20,6 +20,8 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <net/secure_seq.h> #include <net/secure_seq.h>
@ -6307,9 +6307,9 @@ diff -aurN linux-4.14.122/net/ipv6/syncookies.c mptcp-mptcp_v0.94/net/ipv6/synco
ireq->rcv_wscale = rcv_wscale; ireq->rcv_wscale = rcv_wscale;
ireq->ecn_ok = cookie_ecn_ok(&tcp_opt, sock_net(sk), dst); ireq->ecn_ok = cookie_ecn_ok(&tcp_opt, sock_net(sk), dst);
diff -aurN linux-4.14.122/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.94/net/ipv6/tcp_ipv6.c diff -aurN linux-4.14.123/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.94/net/ipv6/tcp_ipv6.c
--- linux-4.14.122/net/ipv6/tcp_ipv6.c 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/net/ipv6/tcp_ipv6.c 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/net/ipv6/tcp_ipv6.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/ipv6/tcp_ipv6.c 2019-06-04 18:49:08.000000000 +0200
@@ -61,6 +61,8 @@ @@ -61,6 +61,8 @@
#include <net/timewait_sock.h> #include <net/timewait_sock.h>
#include <net/inet_common.h> #include <net/inet_common.h>
@ -6931,9 +6931,9 @@ diff -aurN linux-4.14.122/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.94/net/ipv6/tcp_ipv
}; };
/* thinking of making this const? Don't. /* thinking of making this const? Don't.
diff -aurN linux-4.14.122/net/Kconfig mptcp-mptcp_v0.94/net/Kconfig diff -aurN linux-4.14.123/net/Kconfig mptcp-mptcp_v0.94/net/Kconfig
--- linux-4.14.122/net/Kconfig 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/net/Kconfig 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/net/Kconfig 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/Kconfig 2019-06-04 18:49:08.000000000 +0200
@@ -88,6 +88,7 @@ @@ -88,6 +88,7 @@
source "net/ipv4/Kconfig" source "net/ipv4/Kconfig"
source "net/ipv6/Kconfig" source "net/ipv6/Kconfig"
@ -6942,9 +6942,9 @@ diff -aurN linux-4.14.122/net/Kconfig mptcp-mptcp_v0.94/net/Kconfig
endif # if INET endif # if INET
diff -aurN linux-4.14.122/net/Makefile mptcp-mptcp_v0.94/net/Makefile diff -aurN linux-4.14.123/net/Makefile mptcp-mptcp_v0.94/net/Makefile
--- linux-4.14.122/net/Makefile 2019-05-25 18:25:38.000000000 +0200 --- linux-4.14.123/net/Makefile 2019-05-31 15:47:36.000000000 +0200
+++ mptcp-mptcp_v0.94/net/Makefile 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/Makefile 2019-06-04 18:49:08.000000000 +0200
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
obj-$(CONFIG_XFRM) += xfrm/ obj-$(CONFIG_XFRM) += xfrm/
obj-$(CONFIG_UNIX) += unix/ obj-$(CONFIG_UNIX) += unix/
@ -6953,9 +6953,9 @@ diff -aurN linux-4.14.122/net/Makefile mptcp-mptcp_v0.94/net/Makefile
obj-$(CONFIG_PACKET) += packet/ obj-$(CONFIG_PACKET) += packet/
obj-$(CONFIG_NET_KEY) += key/ obj-$(CONFIG_NET_KEY) += key/
obj-$(CONFIG_BRIDGE) += bridge/ obj-$(CONFIG_BRIDGE) += bridge/
diff -aurN linux-4.14.122/net/mptcp/Kconfig mptcp-mptcp_v0.94/net/mptcp/Kconfig diff -aurN linux-4.14.123/net/mptcp/Kconfig mptcp-mptcp_v0.94/net/mptcp/Kconfig
--- linux-4.14.122/net/mptcp/Kconfig 1970-01-01 01:00:00.000000000 +0100 --- linux-4.14.123/net/mptcp/Kconfig 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.94/net/mptcp/Kconfig 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/mptcp/Kconfig 2019-06-04 18:49:08.000000000 +0200
@@ -0,0 +1,129 @@ @@ -0,0 +1,129 @@
+# +#
+# MPTCP configuration +# MPTCP configuration
@ -7086,9 +7086,9 @@ diff -aurN linux-4.14.122/net/mptcp/Kconfig mptcp-mptcp_v0.94/net/mptcp/Kconfig
+ default "redundant" if DEFAULT_REDUNDANT + default "redundant" if DEFAULT_REDUNDANT
+ default "default" + default "default"
+ +
diff -aurN linux-4.14.122/net/mptcp/Makefile mptcp-mptcp_v0.94/net/mptcp/Makefile diff -aurN linux-4.14.123/net/mptcp/Makefile mptcp-mptcp_v0.94/net/mptcp/Makefile
--- linux-4.14.122/net/mptcp/Makefile 1970-01-01 01:00:00.000000000 +0100 --- linux-4.14.123/net/mptcp/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.94/net/mptcp/Makefile 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/mptcp/Makefile 2019-06-04 18:49:08.000000000 +0200
@@ -0,0 +1,22 @@ @@ -0,0 +1,22 @@
+# +#
+## Makefile for MultiPath TCP support code. +## Makefile for MultiPath TCP support code.
@ -7112,9 +7112,9 @@ diff -aurN linux-4.14.122/net/mptcp/Makefile mptcp-mptcp_v0.94/net/mptcp/Makefil
+ +
+mptcp-$(subst m,y,$(CONFIG_IPV6)) += mptcp_ipv6.o +mptcp-$(subst m,y,$(CONFIG_IPV6)) += mptcp_ipv6.o
+ +
diff -aurN linux-4.14.122/net/mptcp/mptcp_balia.c mptcp-mptcp_v0.94/net/mptcp/mptcp_balia.c diff -aurN linux-4.14.123/net/mptcp/mptcp_balia.c mptcp-mptcp_v0.94/net/mptcp/mptcp_balia.c
--- linux-4.14.122/net/mptcp/mptcp_balia.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.14.123/net/mptcp/mptcp_balia.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_balia.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_balia.c 2019-06-04 18:49:08.000000000 +0200
@@ -0,0 +1,268 @@ @@ -0,0 +1,268 @@
+/* +/*
+ * MPTCP implementation - Balia Congestion Control + * MPTCP implementation - Balia Congestion Control
@ -7384,9 +7384,9 @@ diff -aurN linux-4.14.122/net/mptcp/mptcp_balia.c mptcp-mptcp_v0.94/net/mptcp/mp
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("MPTCP BALIA CONGESTION CONTROL ALGORITHM"); +MODULE_DESCRIPTION("MPTCP BALIA CONGESTION CONTROL ALGORITHM");
+MODULE_VERSION("0.1"); +MODULE_VERSION("0.1");
diff -aurN linux-4.14.122/net/mptcp/mptcp_binder.c mptcp-mptcp_v0.94/net/mptcp/mptcp_binder.c diff -aurN linux-4.14.123/net/mptcp/mptcp_binder.c mptcp-mptcp_v0.94/net/mptcp/mptcp_binder.c
--- linux-4.14.122/net/mptcp/mptcp_binder.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.14.123/net/mptcp/mptcp_binder.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_binder.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_binder.c 2019-06-04 18:49:08.000000000 +0200
@@ -0,0 +1,490 @@ @@ -0,0 +1,490 @@
+#include <linux/module.h> +#include <linux/module.h>
+ +
@ -7878,9 +7878,9 @@ diff -aurN linux-4.14.122/net/mptcp/mptcp_binder.c mptcp-mptcp_v0.94/net/mptcp/m
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("BINDER MPTCP"); +MODULE_DESCRIPTION("BINDER MPTCP");
+MODULE_VERSION("0.1"); +MODULE_VERSION("0.1");
diff -aurN linux-4.14.122/net/mptcp/mptcp_coupled.c mptcp-mptcp_v0.94/net/mptcp/mptcp_coupled.c diff -aurN linux-4.14.123/net/mptcp/mptcp_coupled.c mptcp-mptcp_v0.94/net/mptcp/mptcp_coupled.c
--- linux-4.14.122/net/mptcp/mptcp_coupled.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.14.123/net/mptcp/mptcp_coupled.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_coupled.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_coupled.c 2019-06-04 18:49:08.000000000 +0200
@@ -0,0 +1,271 @@ @@ -0,0 +1,271 @@
+/* +/*
+ * MPTCP implementation - Linked Increase congestion control Algorithm (LIA) + * MPTCP implementation - Linked Increase congestion control Algorithm (LIA)
@ -8153,9 +8153,9 @@ diff -aurN linux-4.14.122/net/mptcp/mptcp_coupled.c mptcp-mptcp_v0.94/net/mptcp/
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("MPTCP LINKED INCREASE CONGESTION CONTROL ALGORITHM"); +MODULE_DESCRIPTION("MPTCP LINKED INCREASE CONGESTION CONTROL ALGORITHM");
+MODULE_VERSION("0.1"); +MODULE_VERSION("0.1");
diff -aurN linux-4.14.122/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.94/net/mptcp/mptcp_ctrl.c diff -aurN linux-4.14.123/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.94/net/mptcp/mptcp_ctrl.c
--- linux-4.14.122/net/mptcp/mptcp_ctrl.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.14.123/net/mptcp/mptcp_ctrl.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ctrl.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ctrl.c 2019-06-04 18:49:08.000000000 +0200
@@ -0,0 +1,3014 @@ @@ -0,0 +1,3014 @@
+/* +/*
+ * MPTCP implementation - MPTCP-control + * MPTCP implementation - MPTCP-control
@ -11142,7 +11142,7 @@ diff -aurN linux-4.14.122/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.94/net/mptcp/mpt
+ if (mptcp_register_scheduler(&mptcp_sched_default)) + if (mptcp_register_scheduler(&mptcp_sched_default))
+ goto register_sched_failed; + goto register_sched_failed;
+ +
+ pr_info("MPTCP: Stable release v0.94.4"); + pr_info("MPTCP: Stable release v0.94.5");
+ +
+ mptcp_init_failed = false; + mptcp_init_failed = false;
+ +
@ -11171,9 +11171,9 @@ diff -aurN linux-4.14.122/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.94/net/mptcp/mpt
+mptcp_sock_cache_failed: +mptcp_sock_cache_failed:
+ mptcp_init_failed = true; + mptcp_init_failed = true;
+} +}
diff -aurN linux-4.14.122/net/mptcp/mptcp_fullmesh.c mptcp-mptcp_v0.94/net/mptcp/mptcp_fullmesh.c diff -aurN linux-4.14.123/net/mptcp/mptcp_fullmesh.c mptcp-mptcp_v0.94/net/mptcp/mptcp_fullmesh.c
--- linux-4.14.122/net/mptcp/mptcp_fullmesh.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.14.123/net/mptcp/mptcp_fullmesh.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_fullmesh.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_fullmesh.c 2019-06-04 18:49:08.000000000 +0200
@@ -0,0 +1,2016 @@ @@ -0,0 +1,2016 @@
+#include <linux/module.h> +#include <linux/module.h>
+#include <linux/proc_fs.h> +#include <linux/proc_fs.h>
@ -13191,9 +13191,9 @@ diff -aurN linux-4.14.122/net/mptcp/mptcp_fullmesh.c mptcp-mptcp_v0.94/net/mptcp
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Full-Mesh MPTCP"); +MODULE_DESCRIPTION("Full-Mesh MPTCP");
+MODULE_VERSION("0.88"); +MODULE_VERSION("0.88");
diff -aurN linux-4.14.122/net/mptcp/mptcp_input.c mptcp-mptcp_v0.94/net/mptcp/mptcp_input.c diff -aurN linux-4.14.123/net/mptcp/mptcp_input.c mptcp-mptcp_v0.94/net/mptcp/mptcp_input.c
--- linux-4.14.122/net/mptcp/mptcp_input.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.14.123/net/mptcp/mptcp_input.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_input.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_input.c 2019-06-04 18:49:08.000000000 +0200
@@ -0,0 +1,2475 @@ @@ -0,0 +1,2475 @@
+/* +/*
+ * MPTCP implementation - Sending side + * MPTCP implementation - Sending side
@ -15670,9 +15670,9 @@ diff -aurN linux-4.14.122/net/mptcp/mptcp_input.c mptcp-mptcp_v0.94/net/mptcp/mp
+ tcp_set_rto(sk); + tcp_set_rto(sk);
+ mptcp_set_rto(sk); + mptcp_set_rto(sk);
+} +}
diff -aurN linux-4.14.122/net/mptcp/mptcp_ipv4.c mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv4.c diff -aurN linux-4.14.123/net/mptcp/mptcp_ipv4.c mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv4.c
--- linux-4.14.122/net/mptcp/mptcp_ipv4.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.14.123/net/mptcp/mptcp_ipv4.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv4.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv4.c 2019-06-04 18:49:08.000000000 +0200
@@ -0,0 +1,436 @@ @@ -0,0 +1,436 @@
+/* +/*
+ * MPTCP implementation - IPv4-specific functions + * MPTCP implementation - IPv4-specific functions
@ -16110,9 +16110,9 @@ diff -aurN linux-4.14.122/net/mptcp/mptcp_ipv4.c mptcp-mptcp_v0.94/net/mptcp/mpt
+ kmem_cache_destroy(mptcp_request_sock_ops.slab); + kmem_cache_destroy(mptcp_request_sock_ops.slab);
+ kfree(mptcp_request_sock_ops.slab_name); + kfree(mptcp_request_sock_ops.slab_name);
+} +}
diff -aurN linux-4.14.122/net/mptcp/mptcp_ipv6.c mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv6.c diff -aurN linux-4.14.123/net/mptcp/mptcp_ipv6.c mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv6.c
--- linux-4.14.122/net/mptcp/mptcp_ipv6.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.14.123/net/mptcp/mptcp_ipv6.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv6.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv6.c 2019-06-04 18:49:08.000000000 +0200
@@ -0,0 +1,465 @@ @@ -0,0 +1,465 @@
+/* +/*
+ * MPTCP implementation - IPv6-specific functions + * MPTCP implementation - IPv6-specific functions
@ -16579,9 +16579,9 @@ diff -aurN linux-4.14.122/net/mptcp/mptcp_ipv6.c mptcp-mptcp_v0.94/net/mptcp/mpt
+ kmem_cache_destroy(mptcp6_request_sock_ops.slab); + kmem_cache_destroy(mptcp6_request_sock_ops.slab);
+ kfree(mptcp6_request_sock_ops.slab_name); + kfree(mptcp6_request_sock_ops.slab_name);
+} +}
diff -aurN linux-4.14.122/net/mptcp/mptcp_ndiffports.c mptcp-mptcp_v0.94/net/mptcp/mptcp_ndiffports.c diff -aurN linux-4.14.123/net/mptcp/mptcp_ndiffports.c mptcp-mptcp_v0.94/net/mptcp/mptcp_ndiffports.c
--- linux-4.14.122/net/mptcp/mptcp_ndiffports.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.14.123/net/mptcp/mptcp_ndiffports.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ndiffports.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ndiffports.c 2019-06-04 18:49:08.000000000 +0200
@@ -0,0 +1,173 @@ @@ -0,0 +1,173 @@
+#include <linux/module.h> +#include <linux/module.h>
+ +
@ -16756,9 +16756,9 @@ diff -aurN linux-4.14.122/net/mptcp/mptcp_ndiffports.c mptcp-mptcp_v0.94/net/mpt
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("NDIFF-PORTS MPTCP"); +MODULE_DESCRIPTION("NDIFF-PORTS MPTCP");
+MODULE_VERSION("0.88"); +MODULE_VERSION("0.88");
diff -aurN linux-4.14.122/net/mptcp/mptcp_olia.c mptcp-mptcp_v0.94/net/mptcp/mptcp_olia.c diff -aurN linux-4.14.123/net/mptcp/mptcp_olia.c mptcp-mptcp_v0.94/net/mptcp/mptcp_olia.c
--- linux-4.14.122/net/mptcp/mptcp_olia.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.14.123/net/mptcp/mptcp_olia.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_olia.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_olia.c 2019-06-04 18:49:08.000000000 +0200
@@ -0,0 +1,310 @@ @@ -0,0 +1,310 @@
+/* +/*
+ * MPTCP implementation - OPPORTUNISTIC LINKED INCREASES CONGESTION CONTROL: + * MPTCP implementation - OPPORTUNISTIC LINKED INCREASES CONGESTION CONTROL:
@ -17070,9 +17070,9 @@ diff -aurN linux-4.14.122/net/mptcp/mptcp_olia.c mptcp-mptcp_v0.94/net/mptcp/mpt
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("MPTCP COUPLED CONGESTION CONTROL"); +MODULE_DESCRIPTION("MPTCP COUPLED CONGESTION CONTROL");
+MODULE_VERSION("0.1"); +MODULE_VERSION("0.1");
diff -aurN linux-4.14.122/net/mptcp/mptcp_output.c mptcp-mptcp_v0.94/net/mptcp/mptcp_output.c diff -aurN linux-4.14.123/net/mptcp/mptcp_output.c mptcp-mptcp_v0.94/net/mptcp/mptcp_output.c
--- linux-4.14.122/net/mptcp/mptcp_output.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.14.123/net/mptcp/mptcp_output.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_output.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_output.c 2019-06-04 18:49:08.000000000 +0200
@@ -0,0 +1,1824 @@ @@ -0,0 +1,1824 @@
+/* +/*
+ * MPTCP implementation - Sending side + * MPTCP implementation - Sending side
@ -18898,9 +18898,9 @@ diff -aurN linux-4.14.122/net/mptcp/mptcp_output.c mptcp-mptcp_v0.94/net/mptcp/m
+ return max(xmit_size_goal, mss_now); + return max(xmit_size_goal, mss_now);
+} +}
+ +
diff -aurN linux-4.14.122/net/mptcp/mptcp_pm.c mptcp-mptcp_v0.94/net/mptcp/mptcp_pm.c diff -aurN linux-4.14.123/net/mptcp/mptcp_pm.c mptcp-mptcp_v0.94/net/mptcp/mptcp_pm.c
--- linux-4.14.122/net/mptcp/mptcp_pm.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.14.123/net/mptcp/mptcp_pm.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_pm.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_pm.c 2019-06-04 18:49:08.000000000 +0200
@@ -0,0 +1,226 @@ @@ -0,0 +1,226 @@
+/* +/*
+ * MPTCP implementation - MPTCP-subflow-management + * MPTCP implementation - MPTCP-subflow-management
@ -19128,9 +19128,9 @@ diff -aurN linux-4.14.122/net/mptcp/mptcp_pm.c mptcp-mptcp_v0.94/net/mptcp/mptcp
+ return mptcp_set_default_path_manager(CONFIG_DEFAULT_MPTCP_PM); + return mptcp_set_default_path_manager(CONFIG_DEFAULT_MPTCP_PM);
+} +}
+late_initcall(mptcp_path_manager_default); +late_initcall(mptcp_path_manager_default);
diff -aurN linux-4.14.122/net/mptcp/mptcp_redundant.c mptcp-mptcp_v0.94/net/mptcp/mptcp_redundant.c diff -aurN linux-4.14.123/net/mptcp/mptcp_redundant.c mptcp-mptcp_v0.94/net/mptcp/mptcp_redundant.c
--- linux-4.14.122/net/mptcp/mptcp_redundant.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.14.123/net/mptcp/mptcp_redundant.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_redundant.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_redundant.c 2019-06-04 18:49:08.000000000 +0200
@@ -0,0 +1,301 @@ @@ -0,0 +1,301 @@
+/* +/*
+ * MPTCP Scheduler to reduce latency and jitter. + * MPTCP Scheduler to reduce latency and jitter.
@ -19433,9 +19433,9 @@ diff -aurN linux-4.14.122/net/mptcp/mptcp_redundant.c mptcp-mptcp_v0.94/net/mptc
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("REDUNDANT MPTCP"); +MODULE_DESCRIPTION("REDUNDANT MPTCP");
+MODULE_VERSION("0.90"); +MODULE_VERSION("0.90");
diff -aurN linux-4.14.122/net/mptcp/mptcp_rr.c mptcp-mptcp_v0.94/net/mptcp/mptcp_rr.c diff -aurN linux-4.14.123/net/mptcp/mptcp_rr.c mptcp-mptcp_v0.94/net/mptcp/mptcp_rr.c
--- linux-4.14.122/net/mptcp/mptcp_rr.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.14.123/net/mptcp/mptcp_rr.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_rr.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_rr.c 2019-06-04 18:49:08.000000000 +0200
@@ -0,0 +1,301 @@ @@ -0,0 +1,301 @@
+/* MPTCP Scheduler module selector. Highly inspired by tcp_cong.c */ +/* MPTCP Scheduler module selector. Highly inspired by tcp_cong.c */
+ +
@ -19738,9 +19738,9 @@ diff -aurN linux-4.14.122/net/mptcp/mptcp_rr.c mptcp-mptcp_v0.94/net/mptcp/mptcp
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("ROUNDROBIN MPTCP"); +MODULE_DESCRIPTION("ROUNDROBIN MPTCP");
+MODULE_VERSION("0.89"); +MODULE_VERSION("0.89");
diff -aurN linux-4.14.122/net/mptcp/mptcp_sched.c mptcp-mptcp_v0.94/net/mptcp/mptcp_sched.c diff -aurN linux-4.14.123/net/mptcp/mptcp_sched.c mptcp-mptcp_v0.94/net/mptcp/mptcp_sched.c
--- linux-4.14.122/net/mptcp/mptcp_sched.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.14.123/net/mptcp/mptcp_sched.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_sched.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_sched.c 2019-06-04 18:49:08.000000000 +0200
@@ -0,0 +1,634 @@ @@ -0,0 +1,634 @@
+/* MPTCP Scheduler module selector. Highly inspired by tcp_cong.c */ +/* MPTCP Scheduler module selector. Highly inspired by tcp_cong.c */
+ +
@ -20376,9 +20376,9 @@ diff -aurN linux-4.14.122/net/mptcp/mptcp_sched.c mptcp-mptcp_v0.94/net/mptcp/mp
+ return mptcp_set_default_scheduler(CONFIG_DEFAULT_MPTCP_SCHED); + return mptcp_set_default_scheduler(CONFIG_DEFAULT_MPTCP_SCHED);
+} +}
+late_initcall(mptcp_scheduler_default); +late_initcall(mptcp_scheduler_default);
diff -aurN linux-4.14.122/net/mptcp/mptcp_wvegas.c mptcp-mptcp_v0.94/net/mptcp/mptcp_wvegas.c diff -aurN linux-4.14.123/net/mptcp/mptcp_wvegas.c mptcp-mptcp_v0.94/net/mptcp/mptcp_wvegas.c
--- linux-4.14.122/net/mptcp/mptcp_wvegas.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.14.123/net/mptcp/mptcp_wvegas.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.94/net/mptcp/mptcp_wvegas.c 2019-05-29 18:30:04.000000000 +0200 +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_wvegas.c 2019-06-04 18:49:08.000000000 +0200
@@ -0,0 +1,270 @@ @@ -0,0 +1,270 @@
+/* +/*
+ * MPTCP implementation - WEIGHTED VEGAS + * MPTCP implementation - WEIGHTED VEGAS

151
root/target/linux/generic/hack-4.19/690-mptcp_v0.95.patch
View file

@ -1,6 +1,6 @@
diff -aurN linux-4.19.44/Documentation/networking/ip-sysctl.txt mptcp-mptcp_v0.95/Documentation/networking/ip-sysctl.txt diff -aurN linux-4.19.44/Documentation/networking/ip-sysctl.txt mptcp-mptcp_v0.95/Documentation/networking/ip-sysctl.txt
--- linux-4.19.44/Documentation/networking/ip-sysctl.txt 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/Documentation/networking/ip-sysctl.txt 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/Documentation/networking/ip-sysctl.txt 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/Documentation/networking/ip-sysctl.txt 2019-06-03 18:26:35.000000000 +0200
@@ -755,6 +755,18 @@ @@ -755,6 +755,18 @@
in RFC 5961 (Improving TCP's Robustness to Blind In-Window Attacks) in RFC 5961 (Improving TCP's Robustness to Blind In-Window Attacks)
Default: 100 Default: 100
@ -22,7 +22,7 @@ diff -aurN linux-4.19.44/Documentation/networking/ip-sysctl.txt mptcp-mptcp_v0.9
udp_l3mdev_accept - BOOLEAN udp_l3mdev_accept - BOOLEAN
diff -aurN linux-4.19.44/drivers/infiniband/hw/cxgb4/cm.c mptcp-mptcp_v0.95/drivers/infiniband/hw/cxgb4/cm.c diff -aurN linux-4.19.44/drivers/infiniband/hw/cxgb4/cm.c mptcp-mptcp_v0.95/drivers/infiniband/hw/cxgb4/cm.c
--- linux-4.19.44/drivers/infiniband/hw/cxgb4/cm.c 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/drivers/infiniband/hw/cxgb4/cm.c 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/drivers/infiniband/hw/cxgb4/cm.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/drivers/infiniband/hw/cxgb4/cm.c 2019-06-03 18:26:35.000000000 +0200
@@ -3777,7 +3777,7 @@ @@ -3777,7 +3777,7 @@
*/ */
memset(&tmp_opt, 0, sizeof(tmp_opt)); memset(&tmp_opt, 0, sizeof(tmp_opt));
@ -34,7 +34,7 @@ diff -aurN linux-4.19.44/drivers/infiniband/hw/cxgb4/cm.c mptcp-mptcp_v0.95/driv
memset(req, 0, sizeof(*req)); memset(req, 0, sizeof(*req));
diff -aurN linux-4.19.44/include/linux/skbuff.h mptcp-mptcp_v0.95/include/linux/skbuff.h diff -aurN linux-4.19.44/include/linux/skbuff.h mptcp-mptcp_v0.95/include/linux/skbuff.h
--- linux-4.19.44/include/linux/skbuff.h 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/include/linux/skbuff.h 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/include/linux/skbuff.h 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/include/linux/skbuff.h 2019-06-03 18:26:35.000000000 +0200
@@ -697,7 +697,7 @@ @@ -697,7 +697,7 @@
* want to keep them across layers you have to do a skb_clone() * want to keep them across layers you have to do a skb_clone()
* first. This is owned by whoever has the skb queued ATM. * first. This is owned by whoever has the skb queued ATM.
@ -46,7 +46,7 @@ diff -aurN linux-4.19.44/include/linux/skbuff.h mptcp-mptcp_v0.95/include/linux/
struct { struct {
diff -aurN linux-4.19.44/include/linux/tcp.h mptcp-mptcp_v0.95/include/linux/tcp.h diff -aurN linux-4.19.44/include/linux/tcp.h mptcp-mptcp_v0.95/include/linux/tcp.h
--- linux-4.19.44/include/linux/tcp.h 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/include/linux/tcp.h 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/include/linux/tcp.h 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/include/linux/tcp.h 2019-06-03 18:26:35.000000000 +0200
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
/* TCP Fast Open */ /* TCP Fast Open */
#define TCP_FASTOPEN_COOKIE_MIN 4 /* Min Fast Open Cookie size in bytes */ #define TCP_FASTOPEN_COOKIE_MIN 4 /* Min Fast Open Cookie size in bytes */
@ -205,7 +205,7 @@ diff -aurN linux-4.19.44/include/linux/tcp.h mptcp-mptcp_v0.95/include/linux/tcp
static inline struct tcp_timewait_sock *tcp_twsk(const struct sock *sk) static inline struct tcp_timewait_sock *tcp_twsk(const struct sock *sk)
diff -aurN linux-4.19.44/include/net/inet_common.h mptcp-mptcp_v0.95/include/net/inet_common.h diff -aurN linux-4.19.44/include/net/inet_common.h mptcp-mptcp_v0.95/include/net/inet_common.h
--- linux-4.19.44/include/net/inet_common.h 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/include/net/inet_common.h 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/include/net/inet_common.h 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/include/net/inet_common.h 2019-06-03 18:26:35.000000000 +0200
@@ -2,6 +2,8 @@ @@ -2,6 +2,8 @@
#ifndef _INET_COMMON_H #ifndef _INET_COMMON_H
#define _INET_COMMON_H #define _INET_COMMON_H
@ -226,7 +226,7 @@ diff -aurN linux-4.19.44/include/net/inet_common.h mptcp-mptcp_v0.95/include/net
int addr_len, int flags); int addr_len, int flags);
diff -aurN linux-4.19.44/include/net/inet_connection_sock.h mptcp-mptcp_v0.95/include/net/inet_connection_sock.h diff -aurN linux-4.19.44/include/net/inet_connection_sock.h mptcp-mptcp_v0.95/include/net/inet_connection_sock.h
--- linux-4.19.44/include/net/inet_connection_sock.h 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/include/net/inet_connection_sock.h 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/include/net/inet_connection_sock.h 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/include/net/inet_connection_sock.h 2019-06-03 18:26:35.000000000 +0200
@@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@
struct inet_bind_bucket; struct inet_bind_bucket;
@ -237,7 +237,7 @@ diff -aurN linux-4.19.44/include/net/inet_connection_sock.h mptcp-mptcp_v0.95/in
* Pointers to address related TCP functions * Pointers to address related TCP functions
diff -aurN linux-4.19.44/include/net/inet_sock.h mptcp-mptcp_v0.95/include/net/inet_sock.h diff -aurN linux-4.19.44/include/net/inet_sock.h mptcp-mptcp_v0.95/include/net/inet_sock.h
--- linux-4.19.44/include/net/inet_sock.h 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/include/net/inet_sock.h 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/include/net/inet_sock.h 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/include/net/inet_sock.h 2019-06-03 18:26:35.000000000 +0200
@@ -83,7 +83,7 @@ @@ -83,7 +83,7 @@
#define ireq_state req.__req_common.skc_state #define ireq_state req.__req_common.skc_state
#define ireq_family req.__req_common.skc_family #define ireq_family req.__req_common.skc_family
@ -258,7 +258,7 @@ diff -aurN linux-4.19.44/include/net/inet_sock.h mptcp-mptcp_v0.95/include/net/i
union { union {
diff -aurN linux-4.19.44/include/net/mptcp.h mptcp-mptcp_v0.95/include/net/mptcp.h diff -aurN linux-4.19.44/include/net/mptcp.h mptcp-mptcp_v0.95/include/net/mptcp.h
--- linux-4.19.44/include/net/mptcp.h 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/include/net/mptcp.h 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/include/net/mptcp.h 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/include/net/mptcp.h 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,1490 @@ @@ -0,0 +1,1490 @@
+/* +/*
+ * MPTCP implementation + * MPTCP implementation
@ -1752,7 +1752,7 @@ diff -aurN linux-4.19.44/include/net/mptcp.h mptcp-mptcp_v0.95/include/net/mptcp
+#endif /* _MPTCP_H */ +#endif /* _MPTCP_H */
diff -aurN linux-4.19.44/include/net/mptcp_v4.h mptcp-mptcp_v0.95/include/net/mptcp_v4.h diff -aurN linux-4.19.44/include/net/mptcp_v4.h mptcp-mptcp_v0.95/include/net/mptcp_v4.h
--- linux-4.19.44/include/net/mptcp_v4.h 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/include/net/mptcp_v4.h 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/include/net/mptcp_v4.h 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/include/net/mptcp_v4.h 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,76 @@ @@ -0,0 +1,76 @@
+/* +/*
+ * MPTCP implementation + * MPTCP implementation
@ -1832,7 +1832,7 @@ diff -aurN linux-4.19.44/include/net/mptcp_v4.h mptcp-mptcp_v0.95/include/net/mp
+#endif /* MPTCP_V4_H_ */ +#endif /* MPTCP_V4_H_ */
diff -aurN linux-4.19.44/include/net/mptcp_v6.h mptcp-mptcp_v0.95/include/net/mptcp_v6.h diff -aurN linux-4.19.44/include/net/mptcp_v6.h mptcp-mptcp_v0.95/include/net/mptcp_v6.h
--- linux-4.19.44/include/net/mptcp_v6.h 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/include/net/mptcp_v6.h 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/include/net/mptcp_v6.h 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/include/net/mptcp_v6.h 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,77 @@ @@ -0,0 +1,77 @@
+/* +/*
+ * MPTCP implementation + * MPTCP implementation
@ -1913,7 +1913,7 @@ diff -aurN linux-4.19.44/include/net/mptcp_v6.h mptcp-mptcp_v0.95/include/net/mp
+#endif /* _MPTCP_V6_H */ +#endif /* _MPTCP_V6_H */
diff -aurN linux-4.19.44/include/net/net_namespace.h mptcp-mptcp_v0.95/include/net/net_namespace.h diff -aurN linux-4.19.44/include/net/net_namespace.h mptcp-mptcp_v0.95/include/net/net_namespace.h
--- linux-4.19.44/include/net/net_namespace.h 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/include/net/net_namespace.h 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/include/net/net_namespace.h 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/include/net/net_namespace.h 2019-06-03 18:26:35.000000000 +0200
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
#include <net/netns/packet.h> #include <net/netns/packet.h>
#include <net/netns/ipv4.h> #include <net/netns/ipv4.h>
@ -1934,7 +1934,7 @@ diff -aurN linux-4.19.44/include/net/net_namespace.h mptcp-mptcp_v0.95/include/n
#endif #endif
diff -aurN linux-4.19.44/include/net/netns/mptcp.h mptcp-mptcp_v0.95/include/net/netns/mptcp.h diff -aurN linux-4.19.44/include/net/netns/mptcp.h mptcp-mptcp_v0.95/include/net/netns/mptcp.h
--- linux-4.19.44/include/net/netns/mptcp.h 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/include/net/netns/mptcp.h 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/include/net/netns/mptcp.h 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/include/net/netns/mptcp.h 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,52 @@ @@ -0,0 +1,52 @@
+/* +/*
+ * MPTCP implementation - MPTCP namespace + * MPTCP implementation - MPTCP namespace
@ -1990,7 +1990,7 @@ diff -aurN linux-4.19.44/include/net/netns/mptcp.h mptcp-mptcp_v0.95/include/net
+#endif /* __NETNS_MPTCP_H__ */ +#endif /* __NETNS_MPTCP_H__ */
diff -aurN linux-4.19.44/include/net/snmp.h mptcp-mptcp_v0.95/include/net/snmp.h diff -aurN linux-4.19.44/include/net/snmp.h mptcp-mptcp_v0.95/include/net/snmp.h
--- linux-4.19.44/include/net/snmp.h 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/include/net/snmp.h 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/include/net/snmp.h 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/include/net/snmp.h 2019-06-03 18:26:35.000000000 +0200
@@ -91,7 +91,6 @@ @@ -91,7 +91,6 @@
atomic_long_t mibs[ICMP6MSG_MIB_MAX]; atomic_long_t mibs[ICMP6MSG_MIB_MAX];
}; };
@ -2001,7 +2001,7 @@ diff -aurN linux-4.19.44/include/net/snmp.h mptcp-mptcp_v0.95/include/net/snmp.h
struct tcp_mib { struct tcp_mib {
diff -aurN linux-4.19.44/include/net/sock.h mptcp-mptcp_v0.95/include/net/sock.h diff -aurN linux-4.19.44/include/net/sock.h mptcp-mptcp_v0.95/include/net/sock.h
--- linux-4.19.44/include/net/sock.h 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/include/net/sock.h 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/include/net/sock.h 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/include/net/sock.h 2019-06-03 18:26:35.000000000 +0200
@@ -810,6 +810,7 @@ @@ -810,6 +810,7 @@
SOCK_SELECT_ERR_QUEUE, /* Wake select on error queue */ SOCK_SELECT_ERR_QUEUE, /* Wake select on error queue */
SOCK_RCU_FREE, /* wait rcu grace period in sk_destruct() */ SOCK_RCU_FREE, /* wait rcu grace period in sk_destruct() */
@ -2020,7 +2020,7 @@ diff -aurN linux-4.19.44/include/net/sock.h mptcp-mptcp_v0.95/include/net/sock.h
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
diff -aurN linux-4.19.44/include/net/tcp.h mptcp-mptcp_v0.95/include/net/tcp.h diff -aurN linux-4.19.44/include/net/tcp.h mptcp-mptcp_v0.95/include/net/tcp.h
--- linux-4.19.44/include/net/tcp.h 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/include/net/tcp.h 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/include/net/tcp.h 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/include/net/tcp.h 2019-06-03 18:26:35.000000000 +0200
@@ -183,6 +183,7 @@ @@ -183,6 +183,7 @@
#define TCPOPT_SACK 5 /* SACK Block */ #define TCPOPT_SACK 5 /* SACK Block */
#define TCPOPT_TIMESTAMP 8 /* Better RTT estimations/PAWS */ #define TCPOPT_TIMESTAMP 8 /* Better RTT estimations/PAWS */
@ -2343,7 +2343,7 @@ diff -aurN linux-4.19.44/include/net/tcp.h mptcp-mptcp_v0.95/include/net/tcp.h
{ {
diff -aurN linux-4.19.44/include/net/tcp_states.h mptcp-mptcp_v0.95/include/net/tcp_states.h diff -aurN linux-4.19.44/include/net/tcp_states.h mptcp-mptcp_v0.95/include/net/tcp_states.h
--- linux-4.19.44/include/net/tcp_states.h 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/include/net/tcp_states.h 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/include/net/tcp_states.h 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/include/net/tcp_states.h 2019-06-03 18:26:35.000000000 +0200
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
TCP_LISTEN, TCP_LISTEN,
TCP_CLOSING, /* Now a valid state */ TCP_CLOSING, /* Now a valid state */
@ -2362,7 +2362,7 @@ diff -aurN linux-4.19.44/include/net/tcp_states.h mptcp-mptcp_v0.95/include/net/
#endif /* _LINUX_TCP_STATES_H */ #endif /* _LINUX_TCP_STATES_H */
diff -aurN linux-4.19.44/include/net/transp_v6.h mptcp-mptcp_v0.95/include/net/transp_v6.h diff -aurN linux-4.19.44/include/net/transp_v6.h mptcp-mptcp_v0.95/include/net/transp_v6.h
--- linux-4.19.44/include/net/transp_v6.h 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/include/net/transp_v6.h 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/include/net/transp_v6.h 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/include/net/transp_v6.h 2019-06-03 18:26:35.000000000 +0200
@@ -58,6 +58,8 @@ @@ -58,6 +58,8 @@
/* address family specific functions */ /* address family specific functions */
@ -2374,7 +2374,7 @@ diff -aurN linux-4.19.44/include/net/transp_v6.h mptcp-mptcp_v0.95/include/net/t
diff -aurN linux-4.19.44/include/trace/events/tcp.h mptcp-mptcp_v0.95/include/trace/events/tcp.h diff -aurN linux-4.19.44/include/trace/events/tcp.h mptcp-mptcp_v0.95/include/trace/events/tcp.h
--- linux-4.19.44/include/trace/events/tcp.h 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/include/trace/events/tcp.h 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/include/trace/events/tcp.h 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/include/trace/events/tcp.h 2019-06-03 18:26:35.000000000 +0200
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
#include <linux/tracepoint.h> #include <linux/tracepoint.h>
#include <net/ipv6.h> #include <net/ipv6.h>
@ -2425,7 +2425,7 @@ diff -aurN linux-4.19.44/include/trace/events/tcp.h mptcp-mptcp_v0.95/include/tr
#endif /* _TRACE_TCP_H */ #endif /* _TRACE_TCP_H */
diff -aurN linux-4.19.44/include/uapi/linux/bpf.h mptcp-mptcp_v0.95/include/uapi/linux/bpf.h diff -aurN linux-4.19.44/include/uapi/linux/bpf.h mptcp-mptcp_v0.95/include/uapi/linux/bpf.h
--- linux-4.19.44/include/uapi/linux/bpf.h 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/include/uapi/linux/bpf.h 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/include/uapi/linux/bpf.h 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/include/uapi/linux/bpf.h 2019-06-03 18:26:35.000000000 +0200
@@ -2671,6 +2671,7 @@ @@ -2671,6 +2671,7 @@
BPF_TCP_LISTEN, BPF_TCP_LISTEN,
BPF_TCP_CLOSING, /* Now a valid state */ BPF_TCP_CLOSING, /* Now a valid state */
@ -2436,7 +2436,7 @@ diff -aurN linux-4.19.44/include/uapi/linux/bpf.h mptcp-mptcp_v0.95/include/uapi
}; };
diff -aurN linux-4.19.44/include/uapi/linux/if.h mptcp-mptcp_v0.95/include/uapi/linux/if.h diff -aurN linux-4.19.44/include/uapi/linux/if.h mptcp-mptcp_v0.95/include/uapi/linux/if.h
--- linux-4.19.44/include/uapi/linux/if.h 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/include/uapi/linux/if.h 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/include/uapi/linux/if.h 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/include/uapi/linux/if.h 2019-06-03 18:26:35.000000000 +0200
@@ -132,6 +132,9 @@ @@ -132,6 +132,9 @@
#define IFF_ECHO IFF_ECHO #define IFF_ECHO IFF_ECHO
#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
@ -2449,7 +2449,7 @@ diff -aurN linux-4.19.44/include/uapi/linux/if.h mptcp-mptcp_v0.95/include/uapi/
diff -aurN linux-4.19.44/include/uapi/linux/mptcp.h mptcp-mptcp_v0.95/include/uapi/linux/mptcp.h diff -aurN linux-4.19.44/include/uapi/linux/mptcp.h mptcp-mptcp_v0.95/include/uapi/linux/mptcp.h
--- linux-4.19.44/include/uapi/linux/mptcp.h 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/include/uapi/linux/mptcp.h 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/include/uapi/linux/mptcp.h 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/include/uapi/linux/mptcp.h 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,149 @@ @@ -0,0 +1,149 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/* +/*
@ -2602,7 +2602,7 @@ diff -aurN linux-4.19.44/include/uapi/linux/mptcp.h mptcp-mptcp_v0.95/include/ua
+#endif /* _LINUX_MPTCP_H */ +#endif /* _LINUX_MPTCP_H */
diff -aurN linux-4.19.44/include/uapi/linux/tcp.h mptcp-mptcp_v0.95/include/uapi/linux/tcp.h diff -aurN linux-4.19.44/include/uapi/linux/tcp.h mptcp-mptcp_v0.95/include/uapi/linux/tcp.h
--- linux-4.19.44/include/uapi/linux/tcp.h 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/include/uapi/linux/tcp.h 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/include/uapi/linux/tcp.h 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/include/uapi/linux/tcp.h 2019-06-03 18:26:35.000000000 +0200
@@ -18,9 +18,15 @@ @@ -18,9 +18,15 @@
#ifndef _UAPI_LINUX_TCP_H #ifndef _UAPI_LINUX_TCP_H
#define _UAPI_LINUX_TCP_H #define _UAPI_LINUX_TCP_H
@ -2690,7 +2690,7 @@ diff -aurN linux-4.19.44/include/uapi/linux/tcp.h mptcp-mptcp_v0.95/include/uapi
diff -aurN linux-4.19.44/net/core/dev.c mptcp-mptcp_v0.95/net/core/dev.c diff -aurN linux-4.19.44/net/core/dev.c mptcp-mptcp_v0.95/net/core/dev.c
--- linux-4.19.44/net/core/dev.c 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/net/core/dev.c 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/net/core/dev.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/core/dev.c 2019-06-03 18:26:35.000000000 +0200
@@ -7471,7 +7471,7 @@ @@ -7471,7 +7471,7 @@
dev->flags = (flags & (IFF_DEBUG | IFF_NOTRAILERS | IFF_NOARP | dev->flags = (flags & (IFF_DEBUG | IFF_NOTRAILERS | IFF_NOARP |
@ -2702,7 +2702,7 @@ diff -aurN linux-4.19.44/net/core/dev.c mptcp-mptcp_v0.95/net/core/dev.c
diff -aurN linux-4.19.44/net/core/skbuff.c mptcp-mptcp_v0.95/net/core/skbuff.c diff -aurN linux-4.19.44/net/core/skbuff.c mptcp-mptcp_v0.95/net/core/skbuff.c
--- linux-4.19.44/net/core/skbuff.c 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/net/core/skbuff.c 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/net/core/skbuff.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/core/skbuff.c 2019-06-03 18:26:35.000000000 +0200
@@ -536,7 +536,7 @@ @@ -536,7 +536,7 @@
skb_drop_list(&skb_shinfo(skb)->frag_list); skb_drop_list(&skb_shinfo(skb)->frag_list);
} }
@ -2714,7 +2714,7 @@ diff -aurN linux-4.19.44/net/core/skbuff.c mptcp-mptcp_v0.95/net/core/skbuff.c
diff -aurN linux-4.19.44/net/core/sock.c mptcp-mptcp_v0.95/net/core/sock.c diff -aurN linux-4.19.44/net/core/sock.c mptcp-mptcp_v0.95/net/core/sock.c
--- linux-4.19.44/net/core/sock.c 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/net/core/sock.c 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/net/core/sock.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/core/sock.c 2019-06-03 18:26:35.000000000 +0200
@@ -140,6 +140,11 @@ @@ -140,6 +140,11 @@
#include <trace/events/sock.h> #include <trace/events/sock.h>
@ -2776,7 +2776,7 @@ diff -aurN linux-4.19.44/net/core/sock.c mptcp-mptcp_v0.95/net/core/sock.c
diff -aurN linux-4.19.44/net/ipv4/af_inet.c mptcp-mptcp_v0.95/net/ipv4/af_inet.c diff -aurN linux-4.19.44/net/ipv4/af_inet.c mptcp-mptcp_v0.95/net/ipv4/af_inet.c
--- linux-4.19.44/net/ipv4/af_inet.c 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/net/ipv4/af_inet.c 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/net/ipv4/af_inet.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/ipv4/af_inet.c 2019-06-03 18:26:35.000000000 +0200
@@ -104,6 +104,7 @@ @@ -104,6 +104,7 @@
#include <net/ip_fib.h> #include <net/ip_fib.h>
#include <net/inet_connection_sock.h> #include <net/inet_connection_sock.h>
@ -2842,7 +2842,7 @@ diff -aurN linux-4.19.44/net/ipv4/af_inet.c mptcp-mptcp_v0.95/net/ipv4/af_inet.c
diff -aurN linux-4.19.44/net/ipv4/inet_connection_sock.c mptcp-mptcp_v0.95/net/ipv4/inet_connection_sock.c diff -aurN linux-4.19.44/net/ipv4/inet_connection_sock.c mptcp-mptcp_v0.95/net/ipv4/inet_connection_sock.c
--- linux-4.19.44/net/ipv4/inet_connection_sock.c 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/net/ipv4/inet_connection_sock.c 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/net/ipv4/inet_connection_sock.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/ipv4/inet_connection_sock.c 2019-06-03 18:26:35.000000000 +0200
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
#include <net/route.h> #include <net/route.h>
#include <net/tcp_states.h> #include <net/tcp_states.h>
@ -2902,7 +2902,7 @@ diff -aurN linux-4.19.44/net/ipv4/inet_connection_sock.c mptcp-mptcp_v0.95/net/i
cond_resched(); cond_resched();
diff -aurN linux-4.19.44/net/ipv4/ip_sockglue.c mptcp-mptcp_v0.95/net/ipv4/ip_sockglue.c diff -aurN linux-4.19.44/net/ipv4/ip_sockglue.c mptcp-mptcp_v0.95/net/ipv4/ip_sockglue.c
--- linux-4.19.44/net/ipv4/ip_sockglue.c 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/net/ipv4/ip_sockglue.c 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/net/ipv4/ip_sockglue.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/ipv4/ip_sockglue.c 2019-06-03 18:26:35.000000000 +0200
@@ -44,6 +44,8 @@ @@ -44,6 +44,8 @@
#endif #endif
#include <net/ip_fib.h> #include <net/ip_fib.h>
@ -2944,7 +2944,7 @@ diff -aurN linux-4.19.44/net/ipv4/ip_sockglue.c mptcp-mptcp_v0.95/net/ipv4/ip_so
case IP_TTL: case IP_TTL:
diff -aurN linux-4.19.44/net/ipv4/Kconfig mptcp-mptcp_v0.95/net/ipv4/Kconfig diff -aurN linux-4.19.44/net/ipv4/Kconfig mptcp-mptcp_v0.95/net/ipv4/Kconfig
--- linux-4.19.44/net/ipv4/Kconfig 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/net/ipv4/Kconfig 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/net/ipv4/Kconfig 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/ipv4/Kconfig 2019-06-03 18:26:35.000000000 +0200
@@ -680,6 +680,51 @@ @@ -680,6 +680,51 @@
bufferbloat, policers, or AQM schemes that do not provide a delay bufferbloat, policers, or AQM schemes that do not provide a delay
signal. It requires the fq ("Fair Queue") pacing packet scheduler. signal. It requires the fq ("Fair Queue") pacing packet scheduler.
@ -3032,7 +3032,7 @@ diff -aurN linux-4.19.44/net/ipv4/Kconfig mptcp-mptcp_v0.95/net/ipv4/Kconfig
default "cdg" if DEFAULT_CDG default "cdg" if DEFAULT_CDG
diff -aurN linux-4.19.44/net/ipv4/syncookies.c mptcp-mptcp_v0.95/net/ipv4/syncookies.c diff -aurN linux-4.19.44/net/ipv4/syncookies.c mptcp-mptcp_v0.95/net/ipv4/syncookies.c
--- linux-4.19.44/net/ipv4/syncookies.c 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/net/ipv4/syncookies.c 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/net/ipv4/syncookies.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/ipv4/syncookies.c 2019-06-03 18:26:35.000000000 +0200
@@ -16,6 +16,8 @@ @@ -16,6 +16,8 @@
#include <linux/siphash.h> #include <linux/siphash.h>
#include <linux/kernel.h> #include <linux/kernel.h>
@ -3148,7 +3148,7 @@ diff -aurN linux-4.19.44/net/ipv4/syncookies.c mptcp-mptcp_v0.95/net/ipv4/syncoo
ireq->ecn_ok = cookie_ecn_ok(&tcp_opt, sock_net(sk), &rt->dst); ireq->ecn_ok = cookie_ecn_ok(&tcp_opt, sock_net(sk), &rt->dst);
diff -aurN linux-4.19.44/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c diff -aurN linux-4.19.44/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c
--- linux-4.19.44/net/ipv4/tcp.c 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/net/ipv4/tcp.c 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/net/ipv4/tcp.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/ipv4/tcp.c 2019-06-03 18:26:35.000000000 +0200
@@ -274,6 +274,7 @@ @@ -274,6 +274,7 @@
#include <net/icmp.h> #include <net/icmp.h>
@ -3853,7 +3853,7 @@ diff -aurN linux-4.19.44/net/ipv4/tcp.c mptcp-mptcp_v0.95/net/ipv4/tcp.c
EXPORT_SYMBOL_GPL(tcp_abort); EXPORT_SYMBOL_GPL(tcp_abort);
diff -aurN linux-4.19.44/net/ipv4/tcp_diag.c mptcp-mptcp_v0.95/net/ipv4/tcp_diag.c diff -aurN linux-4.19.44/net/ipv4/tcp_diag.c mptcp-mptcp_v0.95/net/ipv4/tcp_diag.c
--- linux-4.19.44/net/ipv4/tcp_diag.c 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/net/ipv4/tcp_diag.c 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/net/ipv4/tcp_diag.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/ipv4/tcp_diag.c 2019-06-03 18:26:35.000000000 +0200
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
r->idiag_wqueue = tp->write_seq - tp->snd_una; r->idiag_wqueue = tp->write_seq - tp->snd_una;
} }
@ -3865,7 +3865,7 @@ diff -aurN linux-4.19.44/net/ipv4/tcp_diag.c mptcp-mptcp_v0.95/net/ipv4/tcp_diag
#ifdef CONFIG_TCP_MD5SIG #ifdef CONFIG_TCP_MD5SIG
diff -aurN linux-4.19.44/net/ipv4/tcp_fastopen.c mptcp-mptcp_v0.95/net/ipv4/tcp_fastopen.c diff -aurN linux-4.19.44/net/ipv4/tcp_fastopen.c mptcp-mptcp_v0.95/net/ipv4/tcp_fastopen.c
--- linux-4.19.44/net/ipv4/tcp_fastopen.c 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/net/ipv4/tcp_fastopen.c 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/net/ipv4/tcp_fastopen.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/ipv4/tcp_fastopen.c 2019-06-03 18:26:35.000000000 +0200
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
#include <linux/rculist.h> #include <linux/rculist.h>
#include <net/inetpeer.h> #include <net/inetpeer.h>
@ -3917,7 +3917,7 @@ diff -aurN linux-4.19.44/net/ipv4/tcp_fastopen.c mptcp-mptcp_v0.95/net/ipv4/tcp_
*/ */
diff -aurN linux-4.19.44/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_input.c diff -aurN linux-4.19.44/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_input.c
--- linux-4.19.44/net/ipv4/tcp_input.c 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/net/ipv4/tcp_input.c 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/net/ipv4/tcp_input.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/ipv4/tcp_input.c 2019-06-03 18:26:35.000000000 +0200
@@ -76,35 +76,15 @@ @@ -76,35 +76,15 @@
#include <linux/ipsec.h> #include <linux/ipsec.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
@ -4781,7 +4781,7 @@ diff -aurN linux-4.19.44/net/ipv4/tcp_input.c mptcp-mptcp_v0.95/net/ipv4/tcp_inp
tcp_rsk(req)->tfo_listener = false; tcp_rsk(req)->tfo_listener = false;
diff -aurN linux-4.19.44/net/ipv4/tcp_ipv4.c mptcp-mptcp_v0.95/net/ipv4/tcp_ipv4.c diff -aurN linux-4.19.44/net/ipv4/tcp_ipv4.c mptcp-mptcp_v0.95/net/ipv4/tcp_ipv4.c
--- linux-4.19.44/net/ipv4/tcp_ipv4.c 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/net/ipv4/tcp_ipv4.c 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/net/ipv4/tcp_ipv4.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/ipv4/tcp_ipv4.c 2019-06-03 18:26:35.000000000 +0200
@@ -67,6 +67,8 @@ @@ -67,6 +67,8 @@
#include <net/icmp.h> #include <net/icmp.h>
#include <net/inet_hashtables.h> #include <net/inet_hashtables.h>
@ -5230,7 +5230,7 @@ diff -aurN linux-4.19.44/net/ipv4/tcp_ipv4.c mptcp-mptcp_v0.95/net/ipv4/tcp_ipv4
diff -aurN linux-4.19.44/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.95/net/ipv4/tcp_minisocks.c diff -aurN linux-4.19.44/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.95/net/ipv4/tcp_minisocks.c
--- linux-4.19.44/net/ipv4/tcp_minisocks.c 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/net/ipv4/tcp_minisocks.c 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/net/ipv4/tcp_minisocks.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/ipv4/tcp_minisocks.c 2019-06-03 18:26:35.000000000 +0200
@@ -18,11 +18,13 @@ @@ -18,11 +18,13 @@
* Jorge Cwik, <jorge@laser.satlink.net> * Jorge Cwik, <jorge@laser.satlink.net>
*/ */
@ -5451,7 +5451,7 @@ diff -aurN linux-4.19.44/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.95/net/ipv4/tcp
} }
diff -aurN linux-4.19.44/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_output.c diff -aurN linux-4.19.44/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_output.c
--- linux-4.19.44/net/ipv4/tcp_output.c 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/net/ipv4/tcp_output.c 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/net/ipv4/tcp_output.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/ipv4/tcp_output.c 2019-06-03 18:26:35.000000000 +0200
@@ -36,6 +36,12 @@ @@ -36,6 +36,12 @@
#define pr_fmt(fmt) "TCP: " fmt #define pr_fmt(fmt) "TCP: " fmt
@ -6058,7 +6058,7 @@ diff -aurN linux-4.19.44/net/ipv4/tcp_output.c mptcp-mptcp_v0.95/net/ipv4/tcp_ou
/* Cancel probe timer, if it is not required. */ /* Cancel probe timer, if it is not required. */
diff -aurN linux-4.19.44/net/ipv4/tcp_timer.c mptcp-mptcp_v0.95/net/ipv4/tcp_timer.c diff -aurN linux-4.19.44/net/ipv4/tcp_timer.c mptcp-mptcp_v0.95/net/ipv4/tcp_timer.c
--- linux-4.19.44/net/ipv4/tcp_timer.c 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/net/ipv4/tcp_timer.c 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/net/ipv4/tcp_timer.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/ipv4/tcp_timer.c 2019-06-03 18:26:35.000000000 +0200
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
#include <linux/module.h> #include <linux/module.h>
@ -6258,7 +6258,7 @@ diff -aurN linux-4.19.44/net/ipv4/tcp_timer.c mptcp-mptcp_v0.95/net/ipv4/tcp_tim
diff -aurN linux-4.19.44/net/ipv6/addrconf.c mptcp-mptcp_v0.95/net/ipv6/addrconf.c diff -aurN linux-4.19.44/net/ipv6/addrconf.c mptcp-mptcp_v0.95/net/ipv6/addrconf.c
--- linux-4.19.44/net/ipv6/addrconf.c 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/net/ipv6/addrconf.c 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/net/ipv6/addrconf.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/ipv6/addrconf.c 2019-06-03 18:26:35.000000000 +0200
@@ -917,6 +917,7 @@ @@ -917,6 +917,7 @@
kfree_rcu(ifp, rcu); kfree_rcu(ifp, rcu);
@ -6269,7 +6269,7 @@ diff -aurN linux-4.19.44/net/ipv6/addrconf.c mptcp-mptcp_v0.95/net/ipv6/addrconf
ipv6_link_dev_addr(struct inet6_dev *idev, struct inet6_ifaddr *ifp) ipv6_link_dev_addr(struct inet6_dev *idev, struct inet6_ifaddr *ifp)
diff -aurN linux-4.19.44/net/ipv6/af_inet6.c mptcp-mptcp_v0.95/net/ipv6/af_inet6.c diff -aurN linux-4.19.44/net/ipv6/af_inet6.c mptcp-mptcp_v0.95/net/ipv6/af_inet6.c
--- linux-4.19.44/net/ipv6/af_inet6.c 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/net/ipv6/af_inet6.c 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/net/ipv6/af_inet6.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/ipv6/af_inet6.c 2019-06-03 18:26:35.000000000 +0200
@@ -107,8 +107,7 @@ @@ -107,8 +107,7 @@
return (struct ipv6_pinfo *)(((u8 *)sk) + offset); return (struct ipv6_pinfo *)(((u8 *)sk) + offset);
} }
@ -6282,7 +6282,7 @@ diff -aurN linux-4.19.44/net/ipv6/af_inet6.c mptcp-mptcp_v0.95/net/ipv6/af_inet6
struct ipv6_pinfo *np; struct ipv6_pinfo *np;
diff -aurN linux-4.19.44/net/ipv6/ipv6_sockglue.c mptcp-mptcp_v0.95/net/ipv6/ipv6_sockglue.c diff -aurN linux-4.19.44/net/ipv6/ipv6_sockglue.c mptcp-mptcp_v0.95/net/ipv6/ipv6_sockglue.c
--- linux-4.19.44/net/ipv6/ipv6_sockglue.c 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/net/ipv6/ipv6_sockglue.c 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/net/ipv6/ipv6_sockglue.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/ipv6/ipv6_sockglue.c 2019-06-03 18:26:35.000000000 +0200
@@ -48,6 +48,8 @@ @@ -48,6 +48,8 @@
#include <net/addrconf.h> #include <net/addrconf.h>
#include <net/inet_common.h> #include <net/inet_common.h>
@ -6308,7 +6308,7 @@ diff -aurN linux-4.19.44/net/ipv6/ipv6_sockglue.c mptcp-mptcp_v0.95/net/ipv6/ipv
tcp_sync_mss(sk, icsk->icsk_pmtu_cookie); tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);
diff -aurN linux-4.19.44/net/ipv6/syncookies.c mptcp-mptcp_v0.95/net/ipv6/syncookies.c diff -aurN linux-4.19.44/net/ipv6/syncookies.c mptcp-mptcp_v0.95/net/ipv6/syncookies.c
--- linux-4.19.44/net/ipv6/syncookies.c 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/net/ipv6/syncookies.c 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/net/ipv6/syncookies.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/ipv6/syncookies.c 2019-06-03 18:26:35.000000000 +0200
@@ -20,6 +20,8 @@ @@ -20,6 +20,8 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <net/secure_seq.h> #include <net/secure_seq.h>
@ -6392,7 +6392,7 @@ diff -aurN linux-4.19.44/net/ipv6/syncookies.c mptcp-mptcp_v0.95/net/ipv6/syncoo
ireq->ecn_ok = cookie_ecn_ok(&tcp_opt, sock_net(sk), dst); ireq->ecn_ok = cookie_ecn_ok(&tcp_opt, sock_net(sk), dst);
diff -aurN linux-4.19.44/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6.c diff -aurN linux-4.19.44/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6.c
--- linux-4.19.44/net/ipv6/tcp_ipv6.c 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/net/ipv6/tcp_ipv6.c 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6.c 2019-06-03 18:26:35.000000000 +0200
@@ -61,6 +61,8 @@ @@ -61,6 +61,8 @@
#include <net/timewait_sock.h> #include <net/timewait_sock.h>
#include <net/inet_common.h> #include <net/inet_common.h>
@ -6977,7 +6977,7 @@ diff -aurN linux-4.19.44/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.95/net/ipv6/tcp_ipv6
/* thinking of making this const? Don't. /* thinking of making this const? Don't.
diff -aurN linux-4.19.44/net/Kconfig mptcp-mptcp_v0.95/net/Kconfig diff -aurN linux-4.19.44/net/Kconfig mptcp-mptcp_v0.95/net/Kconfig
--- linux-4.19.44/net/Kconfig 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/net/Kconfig 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/net/Kconfig 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/Kconfig 2019-06-03 18:26:35.000000000 +0200
@@ -89,6 +89,7 @@ @@ -89,6 +89,7 @@
source "net/ipv4/Kconfig" source "net/ipv4/Kconfig"
source "net/ipv6/Kconfig" source "net/ipv6/Kconfig"
@ -6988,7 +6988,7 @@ diff -aurN linux-4.19.44/net/Kconfig mptcp-mptcp_v0.95/net/Kconfig
diff -aurN linux-4.19.44/net/Makefile mptcp-mptcp_v0.95/net/Makefile diff -aurN linux-4.19.44/net/Makefile mptcp-mptcp_v0.95/net/Makefile
--- linux-4.19.44/net/Makefile 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/net/Makefile 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/net/Makefile 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/Makefile 2019-06-03 18:26:35.000000000 +0200
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
obj-$(CONFIG_XFRM) += xfrm/ obj-$(CONFIG_XFRM) += xfrm/
obj-$(CONFIG_UNIX) += unix/ obj-$(CONFIG_UNIX) += unix/
@ -6999,7 +6999,7 @@ diff -aurN linux-4.19.44/net/Makefile mptcp-mptcp_v0.95/net/Makefile
obj-$(CONFIG_NET_KEY) += key/ obj-$(CONFIG_NET_KEY) += key/
diff -aurN linux-4.19.44/net/mptcp/Kconfig mptcp-mptcp_v0.95/net/mptcp/Kconfig diff -aurN linux-4.19.44/net/mptcp/Kconfig mptcp-mptcp_v0.95/net/mptcp/Kconfig
--- linux-4.19.44/net/mptcp/Kconfig 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/net/mptcp/Kconfig 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/net/mptcp/Kconfig 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/mptcp/Kconfig 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,146 @@ @@ -0,0 +1,146 @@
+# +#
+# MPTCP configuration +# MPTCP configuration
@ -7149,7 +7149,7 @@ diff -aurN linux-4.19.44/net/mptcp/Kconfig mptcp-mptcp_v0.95/net/mptcp/Kconfig
+ +
diff -aurN linux-4.19.44/net/mptcp/Makefile mptcp-mptcp_v0.95/net/mptcp/Makefile diff -aurN linux-4.19.44/net/mptcp/Makefile mptcp-mptcp_v0.95/net/mptcp/Makefile
--- linux-4.19.44/net/mptcp/Makefile 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/net/mptcp/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/net/mptcp/Makefile 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/mptcp/Makefile 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
+# +#
+## Makefile for MultiPath TCP support code. +## Makefile for MultiPath TCP support code.
@ -7177,7 +7177,7 @@ diff -aurN linux-4.19.44/net/mptcp/Makefile mptcp-mptcp_v0.95/net/mptcp/Makefile
+mptcp-$(subst m,y,$(CONFIG_IPV6)) += mptcp_ipv6.o +mptcp-$(subst m,y,$(CONFIG_IPV6)) += mptcp_ipv6.o
diff -aurN linux-4.19.44/net/mptcp/mctcp_desync.c mptcp-mptcp_v0.95/net/mptcp/mctcp_desync.c diff -aurN linux-4.19.44/net/mptcp/mctcp_desync.c mptcp-mptcp_v0.95/net/mptcp/mctcp_desync.c
--- linux-4.19.44/net/mptcp/mctcp_desync.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/net/mptcp/mctcp_desync.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/net/mptcp/mctcp_desync.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/mptcp/mctcp_desync.c 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,193 @@ @@ -0,0 +1,193 @@
+/* +/*
+ * Desynchronized Multi-Channel TCP Congestion Control Algorithm + * Desynchronized Multi-Channel TCP Congestion Control Algorithm
@ -7374,7 +7374,7 @@ diff -aurN linux-4.19.44/net/mptcp/mctcp_desync.c mptcp-mptcp_v0.95/net/mptcp/mc
+MODULE_VERSION("1.0"); +MODULE_VERSION("1.0");
diff -aurN linux-4.19.44/net/mptcp/mptcp_balia.c mptcp-mptcp_v0.95/net/mptcp/mptcp_balia.c diff -aurN linux-4.19.44/net/mptcp/mptcp_balia.c mptcp-mptcp_v0.95/net/mptcp/mptcp_balia.c
--- linux-4.19.44/net/mptcp/mptcp_balia.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/net/mptcp/mptcp_balia.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_balia.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/mptcp/mptcp_balia.c 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,261 @@ @@ -0,0 +1,261 @@
+/* +/*
+ * MPTCP implementation - Balia Congestion Control + * MPTCP implementation - Balia Congestion Control
@ -7639,7 +7639,7 @@ diff -aurN linux-4.19.44/net/mptcp/mptcp_balia.c mptcp-mptcp_v0.95/net/mptcp/mpt
+MODULE_VERSION("0.1"); +MODULE_VERSION("0.1");
diff -aurN linux-4.19.44/net/mptcp/mptcp_binder.c mptcp-mptcp_v0.95/net/mptcp/mptcp_binder.c diff -aurN linux-4.19.44/net/mptcp/mptcp_binder.c mptcp-mptcp_v0.95/net/mptcp/mptcp_binder.c
--- linux-4.19.44/net/mptcp/mptcp_binder.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/net/mptcp/mptcp_binder.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_binder.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/mptcp/mptcp_binder.c 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,494 @@ @@ -0,0 +1,494 @@
+#include <linux/module.h> +#include <linux/module.h>
+ +
@ -8137,7 +8137,7 @@ diff -aurN linux-4.19.44/net/mptcp/mptcp_binder.c mptcp-mptcp_v0.95/net/mptcp/mp
+MODULE_VERSION("0.1"); +MODULE_VERSION("0.1");
diff -aurN linux-4.19.44/net/mptcp/mptcp_blest.c mptcp-mptcp_v0.95/net/mptcp/mptcp_blest.c diff -aurN linux-4.19.44/net/mptcp/mptcp_blest.c mptcp-mptcp_v0.95/net/mptcp/mptcp_blest.c
--- linux-4.19.44/net/mptcp/mptcp_blest.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/net/mptcp/mptcp_blest.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_blest.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/mptcp/mptcp_blest.c 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,475 @@ @@ -0,0 +1,475 @@
+// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0
+/* MPTCP Scheduler to reduce HoL-blocking and spurious retransmissions. +/* MPTCP Scheduler to reduce HoL-blocking and spurious retransmissions.
@ -8616,7 +8616,7 @@ diff -aurN linux-4.19.44/net/mptcp/mptcp_blest.c mptcp-mptcp_v0.95/net/mptcp/mpt
+MODULE_VERSION("0.95"); +MODULE_VERSION("0.95");
diff -aurN linux-4.19.44/net/mptcp/mptcp_coupled.c mptcp-mptcp_v0.95/net/mptcp/mptcp_coupled.c diff -aurN linux-4.19.44/net/mptcp/mptcp_coupled.c mptcp-mptcp_v0.95/net/mptcp/mptcp_coupled.c
--- linux-4.19.44/net/mptcp/mptcp_coupled.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/net/mptcp/mptcp_coupled.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_coupled.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/mptcp/mptcp_coupled.c 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,262 @@ @@ -0,0 +1,262 @@
+/* +/*
+ * MPTCP implementation - Linked Increase congestion control Algorithm (LIA) + * MPTCP implementation - Linked Increase congestion control Algorithm (LIA)
@ -8882,7 +8882,7 @@ diff -aurN linux-4.19.44/net/mptcp/mptcp_coupled.c mptcp-mptcp_v0.95/net/mptcp/m
+MODULE_VERSION("0.1"); +MODULE_VERSION("0.1");
diff -aurN linux-4.19.44/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ctrl.c diff -aurN linux-4.19.44/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ctrl.c
--- linux-4.19.44/net/mptcp/mptcp_ctrl.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/net/mptcp/mptcp_ctrl.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ctrl.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ctrl.c 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,3124 @@ @@ -0,0 +1,3124 @@
+/* +/*
+ * MPTCP implementation - MPTCP-control + * MPTCP implementation - MPTCP-control
@ -12010,7 +12010,7 @@ diff -aurN linux-4.19.44/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.95/net/mptcp/mptc
+} +}
diff -aurN linux-4.19.44/net/mptcp/mptcp_fullmesh.c mptcp-mptcp_v0.95/net/mptcp/mptcp_fullmesh.c diff -aurN linux-4.19.44/net/mptcp/mptcp_fullmesh.c mptcp-mptcp_v0.95/net/mptcp/mptcp_fullmesh.c
--- linux-4.19.44/net/mptcp/mptcp_fullmesh.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/net/mptcp/mptcp_fullmesh.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_fullmesh.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/mptcp/mptcp_fullmesh.c 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,1941 @@ @@ -0,0 +1,1941 @@
+#include <linux/module.h> +#include <linux/module.h>
+#include <linux/proc_fs.h> +#include <linux/proc_fs.h>
@ -13955,7 +13955,7 @@ diff -aurN linux-4.19.44/net/mptcp/mptcp_fullmesh.c mptcp-mptcp_v0.95/net/mptcp/
+MODULE_VERSION("0.88"); +MODULE_VERSION("0.88");
diff -aurN linux-4.19.44/net/mptcp/mptcp_input.c mptcp-mptcp_v0.95/net/mptcp/mptcp_input.c diff -aurN linux-4.19.44/net/mptcp/mptcp_input.c mptcp-mptcp_v0.95/net/mptcp/mptcp_input.c
--- linux-4.19.44/net/mptcp/mptcp_input.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/net/mptcp/mptcp_input.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_input.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/mptcp/mptcp_input.c 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,2400 @@ @@ -0,0 +1,2400 @@
+/* +/*
+ * MPTCP implementation - Sending side + * MPTCP implementation - Sending side
@ -16359,7 +16359,7 @@ diff -aurN linux-4.19.44/net/mptcp/mptcp_input.c mptcp-mptcp_v0.95/net/mptcp/mpt
+} +}
diff -aurN linux-4.19.44/net/mptcp/mptcp_ipv4.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv4.c diff -aurN linux-4.19.44/net/mptcp/mptcp_ipv4.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv4.c
--- linux-4.19.44/net/mptcp/mptcp_ipv4.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/net/mptcp/mptcp_ipv4.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv4.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv4.c 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,427 @@ @@ -0,0 +1,427 @@
+/* +/*
+ * MPTCP implementation - IPv4-specific functions + * MPTCP implementation - IPv4-specific functions
@ -16790,7 +16790,7 @@ diff -aurN linux-4.19.44/net/mptcp/mptcp_ipv4.c mptcp-mptcp_v0.95/net/mptcp/mptc
+} +}
diff -aurN linux-4.19.44/net/mptcp/mptcp_ipv6.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv6.c diff -aurN linux-4.19.44/net/mptcp/mptcp_ipv6.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv6.c
--- linux-4.19.44/net/mptcp/mptcp_ipv6.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/net/mptcp/mptcp_ipv6.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv6.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ipv6.c 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,475 @@ @@ -0,0 +1,475 @@
+/* +/*
+ * MPTCP implementation - IPv6-specific functions + * MPTCP implementation - IPv6-specific functions
@ -17269,7 +17269,7 @@ diff -aurN linux-4.19.44/net/mptcp/mptcp_ipv6.c mptcp-mptcp_v0.95/net/mptcp/mptc
+} +}
diff -aurN linux-4.19.44/net/mptcp/mptcp_ndiffports.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ndiffports.c diff -aurN linux-4.19.44/net/mptcp/mptcp_ndiffports.c mptcp-mptcp_v0.95/net/mptcp/mptcp_ndiffports.c
--- linux-4.19.44/net/mptcp/mptcp_ndiffports.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/net/mptcp/mptcp_ndiffports.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ndiffports.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/mptcp/mptcp_ndiffports.c 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,174 @@ @@ -0,0 +1,174 @@
+#include <linux/module.h> +#include <linux/module.h>
+ +
@ -17447,8 +17447,8 @@ diff -aurN linux-4.19.44/net/mptcp/mptcp_ndiffports.c mptcp-mptcp_v0.95/net/mptc
+MODULE_VERSION("0.88"); +MODULE_VERSION("0.88");
diff -aurN linux-4.19.44/net/mptcp/mptcp_netlink.c mptcp-mptcp_v0.95/net/mptcp/mptcp_netlink.c diff -aurN linux-4.19.44/net/mptcp/mptcp_netlink.c mptcp-mptcp_v0.95/net/mptcp/mptcp_netlink.c
--- linux-4.19.44/net/mptcp/mptcp_netlink.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/net/mptcp/mptcp_netlink.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_netlink.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/mptcp/mptcp_netlink.c 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,1266 @@ @@ -0,0 +1,1277 @@
+// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0
+/* MPTCP implementation - Netlink Path Manager +/* MPTCP implementation - Netlink Path Manager
+ * + *
@ -18321,6 +18321,8 @@ diff -aurN linux-4.19.44/net/mptcp/mptcp_netlink.c mptcp-mptcp_v0.95/net/mptcp/m
+ } + }
+ +
+ if (!info->attrs[MPTCP_ATTR_SADDR4]) { + if (!info->attrs[MPTCP_ATTR_SADDR4]) {
+ bool found = false;
+
+ mptcp_for_each_bit_set(priv->loc4_bits, i) { + mptcp_for_each_bit_set(priv->loc4_bits, i) {
+ if (priv->locaddr4[i].loc4_id == loc_id) { + if (priv->locaddr4[i].loc4_id == loc_id) {
+ loc.addr = priv->locaddr4[i].addr; + loc.addr = priv->locaddr4[i].addr;
@ -18328,10 +18330,13 @@ diff -aurN linux-4.19.44/net/mptcp/mptcp_netlink.c mptcp-mptcp_v0.95/net/mptcp/m
+ priv->locaddr4[i].low_prio; + priv->locaddr4[i].low_prio;
+ loc.if_idx = + loc.if_idx =
+ priv->locaddr4[i].if_idx; + priv->locaddr4[i].if_idx;
+ found = true;
+ break; + break;
+ } + }
+ } + }
+ goto create_failed; +
+ if (!found)
+ goto create_failed;
+ } else { + } else {
+ loc.addr.s_addr = + loc.addr.s_addr =
+ nla_get_u32(info->attrs[MPTCP_ATTR_SADDR4]); + nla_get_u32(info->attrs[MPTCP_ATTR_SADDR4]);
@ -18365,6 +18370,8 @@ diff -aurN linux-4.19.44/net/mptcp/mptcp_netlink.c mptcp-mptcp_v0.95/net/mptcp/m
+ } + }
+ +
+ if (!info->attrs[MPTCP_ATTR_SADDR6]) { + if (!info->attrs[MPTCP_ATTR_SADDR6]) {
+ bool found = false;
+
+ mptcp_for_each_bit_set(priv->loc6_bits, i) { + mptcp_for_each_bit_set(priv->loc6_bits, i) {
+ if (priv->locaddr6[i].loc6_id == loc_id) { + if (priv->locaddr6[i].loc6_id == loc_id) {
+ loc.addr = priv->locaddr6[i].addr; + loc.addr = priv->locaddr6[i].addr;
@ -18372,10 +18379,14 @@ diff -aurN linux-4.19.44/net/mptcp/mptcp_netlink.c mptcp-mptcp_v0.95/net/mptcp/m
+ priv->locaddr6[i].low_prio; + priv->locaddr6[i].low_prio;
+ loc.if_idx = + loc.if_idx =
+ priv->locaddr6[i].if_idx; + priv->locaddr6[i].if_idx;
+
+ found = true;
+ break; + break;
+ } + }
+ } + }
+ goto create_failed; +
+ if (!found)
+ goto create_failed;
+ } else { + } else {
+ loc.addr = *(struct in6_addr *) + loc.addr = *(struct in6_addr *)
+ nla_data(info->attrs[MPTCP_ATTR_SADDR6]); + nla_data(info->attrs[MPTCP_ATTR_SADDR6]);
@ -18717,7 +18728,7 @@ diff -aurN linux-4.19.44/net/mptcp/mptcp_netlink.c mptcp-mptcp_v0.95/net/mptcp/m
+MODULE_ALIAS_GENL_FAMILY(MPTCP_GENL_NAME); +MODULE_ALIAS_GENL_FAMILY(MPTCP_GENL_NAME);
diff -aurN linux-4.19.44/net/mptcp/mptcp_olia.c mptcp-mptcp_v0.95/net/mptcp/mptcp_olia.c diff -aurN linux-4.19.44/net/mptcp/mptcp_olia.c mptcp-mptcp_v0.95/net/mptcp/mptcp_olia.c
--- linux-4.19.44/net/mptcp/mptcp_olia.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/net/mptcp/mptcp_olia.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_olia.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/mptcp/mptcp_olia.c 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,318 @@ @@ -0,0 +1,318 @@
+/* +/*
+ * MPTCP implementation - OPPORTUNISTIC LINKED INCREASES CONGESTION CONTROL: + * MPTCP implementation - OPPORTUNISTIC LINKED INCREASES CONGESTION CONTROL:
@ -19039,7 +19050,7 @@ diff -aurN linux-4.19.44/net/mptcp/mptcp_olia.c mptcp-mptcp_v0.95/net/mptcp/mptc
+MODULE_VERSION("0.1"); +MODULE_VERSION("0.1");
diff -aurN linux-4.19.44/net/mptcp/mptcp_output.c mptcp-mptcp_v0.95/net/mptcp/mptcp_output.c diff -aurN linux-4.19.44/net/mptcp/mptcp_output.c mptcp-mptcp_v0.95/net/mptcp/mptcp_output.c
--- linux-4.19.44/net/mptcp/mptcp_output.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/net/mptcp/mptcp_output.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_output.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/mptcp/mptcp_output.c 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,1929 @@ @@ -0,0 +1,1929 @@
+/* +/*
+ * MPTCP implementation - Sending side + * MPTCP implementation - Sending side
@ -20972,7 +20983,7 @@ diff -aurN linux-4.19.44/net/mptcp/mptcp_output.c mptcp-mptcp_v0.95/net/mptcp/mp
+ +
diff -aurN linux-4.19.44/net/mptcp/mptcp_pm.c mptcp-mptcp_v0.95/net/mptcp/mptcp_pm.c diff -aurN linux-4.19.44/net/mptcp/mptcp_pm.c mptcp-mptcp_v0.95/net/mptcp/mptcp_pm.c
--- linux-4.19.44/net/mptcp/mptcp_pm.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/net/mptcp/mptcp_pm.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_pm.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/mptcp/mptcp_pm.c 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,226 @@ @@ -0,0 +1,226 @@
+/* +/*
+ * MPTCP implementation - MPTCP-subflow-management + * MPTCP implementation - MPTCP-subflow-management
@ -21202,7 +21213,7 @@ diff -aurN linux-4.19.44/net/mptcp/mptcp_pm.c mptcp-mptcp_v0.95/net/mptcp/mptcp_
+late_initcall(mptcp_path_manager_default); +late_initcall(mptcp_path_manager_default);
diff -aurN linux-4.19.44/net/mptcp/mptcp_redundant.c mptcp-mptcp_v0.95/net/mptcp/mptcp_redundant.c diff -aurN linux-4.19.44/net/mptcp/mptcp_redundant.c mptcp-mptcp_v0.95/net/mptcp/mptcp_redundant.c
--- linux-4.19.44/net/mptcp/mptcp_redundant.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/net/mptcp/mptcp_redundant.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_redundant.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/mptcp/mptcp_redundant.c 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,389 @@ @@ -0,0 +1,389 @@
+/* +/*
+ * MPTCP Scheduler to reduce latency and jitter. + * MPTCP Scheduler to reduce latency and jitter.
@ -21595,7 +21606,7 @@ diff -aurN linux-4.19.44/net/mptcp/mptcp_redundant.c mptcp-mptcp_v0.95/net/mptcp
+MODULE_VERSION("0.90"); +MODULE_VERSION("0.90");
diff -aurN linux-4.19.44/net/mptcp/mptcp_rr.c mptcp-mptcp_v0.95/net/mptcp/mptcp_rr.c diff -aurN linux-4.19.44/net/mptcp/mptcp_rr.c mptcp-mptcp_v0.95/net/mptcp/mptcp_rr.c
--- linux-4.19.44/net/mptcp/mptcp_rr.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/net/mptcp/mptcp_rr.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_rr.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/mptcp/mptcp_rr.c 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,309 @@ @@ -0,0 +1,309 @@
+/* MPTCP Scheduler module selector. Highly inspired by tcp_cong.c */ +/* MPTCP Scheduler module selector. Highly inspired by tcp_cong.c */
+ +
@ -21908,7 +21919,7 @@ diff -aurN linux-4.19.44/net/mptcp/mptcp_rr.c mptcp-mptcp_v0.95/net/mptcp/mptcp_
+MODULE_VERSION("0.89"); +MODULE_VERSION("0.89");
diff -aurN linux-4.19.44/net/mptcp/mptcp_sched.c mptcp-mptcp_v0.95/net/mptcp/mptcp_sched.c diff -aurN linux-4.19.44/net/mptcp/mptcp_sched.c mptcp-mptcp_v0.95/net/mptcp/mptcp_sched.c
--- linux-4.19.44/net/mptcp/mptcp_sched.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/net/mptcp/mptcp_sched.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_sched.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/mptcp/mptcp_sched.c 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,635 @@ @@ -0,0 +1,635 @@
+/* MPTCP Scheduler module selector. Highly inspired by tcp_cong.c */ +/* MPTCP Scheduler module selector. Highly inspired by tcp_cong.c */
+ +
@ -22547,7 +22558,7 @@ diff -aurN linux-4.19.44/net/mptcp/mptcp_sched.c mptcp-mptcp_v0.95/net/mptcp/mpt
+late_initcall(mptcp_scheduler_default); +late_initcall(mptcp_scheduler_default);
diff -aurN linux-4.19.44/net/mptcp/mptcp_wvegas.c mptcp-mptcp_v0.95/net/mptcp/mptcp_wvegas.c diff -aurN linux-4.19.44/net/mptcp/mptcp_wvegas.c mptcp-mptcp_v0.95/net/mptcp/mptcp_wvegas.c
--- linux-4.19.44/net/mptcp/mptcp_wvegas.c 1970-01-01 01:00:00.000000000 +0100 --- linux-4.19.44/net/mptcp/mptcp_wvegas.c 1970-01-01 01:00:00.000000000 +0100
+++ mptcp-mptcp_v0.95/net/mptcp/mptcp_wvegas.c 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/net/mptcp/mptcp_wvegas.c 2019-06-03 18:26:35.000000000 +0200
@@ -0,0 +1,271 @@ @@ -0,0 +1,271 @@
+/* +/*
+ * MPTCP implementation - WEIGHTED VEGAS + * MPTCP implementation - WEIGHTED VEGAS
@ -22822,7 +22833,7 @@ diff -aurN linux-4.19.44/net/mptcp/mptcp_wvegas.c mptcp-mptcp_v0.95/net/mptcp/mp
+MODULE_VERSION("0.1"); +MODULE_VERSION("0.1");
diff -aurN linux-4.19.44/tools/include/uapi/linux/bpf.h mptcp-mptcp_v0.95/tools/include/uapi/linux/bpf.h diff -aurN linux-4.19.44/tools/include/uapi/linux/bpf.h mptcp-mptcp_v0.95/tools/include/uapi/linux/bpf.h
--- linux-4.19.44/tools/include/uapi/linux/bpf.h 2019-05-16 19:41:32.000000000 +0200 --- linux-4.19.44/tools/include/uapi/linux/bpf.h 2019-05-16 19:41:32.000000000 +0200
+++ mptcp-mptcp_v0.95/tools/include/uapi/linux/bpf.h 2019-05-29 16:32:06.000000000 +0200 +++ mptcp-mptcp_v0.95/tools/include/uapi/linux/bpf.h 2019-06-03 18:26:35.000000000 +0200
@@ -2671,6 +2671,7 @@ @@ -2671,6 +2671,7 @@
BPF_TCP_LISTEN, BPF_TCP_LISTEN,
BPF_TCP_CLOSING, /* Now a valid state */ BPF_TCP_CLOSING, /* Now a valid state */