mirror of
				https://github.com/Ysurac/openmptcprouter.git
				synced 2025-03-09 15:40:20 +00:00 
			
		
		
		
	Latest MPTCP patches
This commit is contained in:
		
							parent
							
								
									8ab9b3ea47
								
							
						
					
					
						commit
						6a6a2daecc
					
				
					 1 changed files with 73 additions and 64 deletions
				
			
		|  | @ -1,6 +1,6 @@ | |||
| diff -aurN linux-4.14.105/Documentation/networking/ip-sysctl.txt mptcp-mptcp_v0.94/Documentation/networking/ip-sysctl.txt
 | ||||
| --- linux-4.14.105/Documentation/networking/ip-sysctl.txt	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/Documentation/networking/ip-sysctl.txt	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/Documentation/networking/ip-sysctl.txt	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -725,6 +725,18 @@
 | ||||
|  	in RFC 5961 (Improving TCP's Robustness to Blind In-Window Attacks) | ||||
|  	Default: 100 | ||||
|  | @ -22,7 +22,7 @@ diff -aurN linux-4.14.105/Documentation/networking/ip-sysctl.txt mptcp-mptcp_v0. | |||
|  udp_l3mdev_accept - BOOLEAN | ||||
| diff -aurN linux-4.14.105/drivers/infiniband/hw/cxgb4/cm.c mptcp-mptcp_v0.94/drivers/infiniband/hw/cxgb4/cm.c
 | ||||
| --- linux-4.14.105/drivers/infiniband/hw/cxgb4/cm.c	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/drivers/infiniband/hw/cxgb4/cm.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/drivers/infiniband/hw/cxgb4/cm.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -3752,7 +3752,7 @@
 | ||||
|  	 */ | ||||
|  	memset(&tmp_opt, 0, sizeof(tmp_opt)); | ||||
|  | @ -34,7 +34,7 @@ diff -aurN linux-4.14.105/drivers/infiniband/hw/cxgb4/cm.c mptcp-mptcp_v0.94/dri | |||
|  	memset(req, 0, sizeof(*req)); | ||||
| diff -aurN linux-4.14.105/include/linux/skbuff.h mptcp-mptcp_v0.94/include/linux/skbuff.h
 | ||||
| --- linux-4.14.105/include/linux/skbuff.h	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/linux/skbuff.h	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/linux/skbuff.h	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -690,7 +690,7 @@
 | ||||
|  	 * want to keep them across layers you have to do a skb_clone() | ||||
|  	 * first. This is owned by whoever has the skb queued ATM. | ||||
|  | @ -46,7 +46,7 @@ diff -aurN linux-4.14.105/include/linux/skbuff.h mptcp-mptcp_v0.94/include/linux | |||
|  	void			(*destructor)(struct sk_buff *skb); | ||||
| diff -aurN linux-4.14.105/include/linux/tcp.h mptcp-mptcp_v0.94/include/linux/tcp.h
 | ||||
| --- linux-4.14.105/include/linux/tcp.h	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/linux/tcp.h	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/linux/tcp.h	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -58,7 +58,7 @@
 | ||||
|  /* TCP Fast Open */ | ||||
|  #define TCP_FASTOPEN_COOKIE_MIN	4	/* Min Fast Open Cookie size in bytes */ | ||||
|  | @ -205,7 +205,7 @@ diff -aurN linux-4.14.105/include/linux/tcp.h mptcp-mptcp_v0.94/include/linux/tc | |||
|  static inline struct tcp_timewait_sock *tcp_twsk(const struct sock *sk) | ||||
| diff -aurN linux-4.14.105/include/net/inet_common.h mptcp-mptcp_v0.94/include/net/inet_common.h
 | ||||
| --- linux-4.14.105/include/net/inet_common.h	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/inet_common.h	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/inet_common.h	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -2,6 +2,8 @@
 | ||||
|  #ifndef _INET_COMMON_H | ||||
|  #define _INET_COMMON_H | ||||
|  | @ -226,7 +226,7 @@ diff -aurN linux-4.14.105/include/net/inet_common.h mptcp-mptcp_v0.94/include/ne | |||
|  			int addr_len, int flags); | ||||
| diff -aurN linux-4.14.105/include/net/inet_connection_sock.h mptcp-mptcp_v0.94/include/net/inet_connection_sock.h
 | ||||
| --- linux-4.14.105/include/net/inet_connection_sock.h	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/inet_connection_sock.h	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/inet_connection_sock.h	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -30,6 +30,7 @@
 | ||||
|   | ||||
|  struct inet_bind_bucket; | ||||
|  | @ -237,7 +237,7 @@ diff -aurN linux-4.14.105/include/net/inet_connection_sock.h mptcp-mptcp_v0.94/i | |||
|   * Pointers to address related TCP functions | ||||
| diff -aurN linux-4.14.105/include/net/inet_sock.h mptcp-mptcp_v0.94/include/net/inet_sock.h
 | ||||
| --- linux-4.14.105/include/net/inet_sock.h	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/inet_sock.h	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/inet_sock.h	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -90,7 +90,9 @@
 | ||||
|  				wscale_ok  : 1, | ||||
|  				ecn_ok	   : 1, | ||||
|  | @ -251,7 +251,7 @@ diff -aurN linux-4.14.105/include/net/inet_sock.h mptcp-mptcp_v0.94/include/net/ | |||
|  		struct ip_options_rcu __rcu	*ireq_opt; | ||||
| diff -aurN linux-4.14.105/include/net/mptcp.h mptcp-mptcp_v0.94/include/net/mptcp.h
 | ||||
| --- linux-4.14.105/include/net/mptcp.h	1970-01-01 01:00:00.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/mptcp.h	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/mptcp.h	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -0,0 +1,1511 @@
 | ||||
| +/*
 | ||||
| + *	MPTCP implementation
 | ||||
|  | @ -1766,7 +1766,7 @@ diff -aurN linux-4.14.105/include/net/mptcp.h mptcp-mptcp_v0.94/include/net/mptc | |||
| +#endif /* _MPTCP_H */
 | ||||
| diff -aurN linux-4.14.105/include/net/mptcp_v4.h mptcp-mptcp_v0.94/include/net/mptcp_v4.h
 | ||||
| --- linux-4.14.105/include/net/mptcp_v4.h	1970-01-01 01:00:00.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/mptcp_v4.h	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/mptcp_v4.h	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -0,0 +1,68 @@
 | ||||
| +/*
 | ||||
| + *	MPTCP implementation
 | ||||
|  | @ -1838,7 +1838,7 @@ diff -aurN linux-4.14.105/include/net/mptcp_v4.h mptcp-mptcp_v0.94/include/net/m | |||
| +#endif /* MPTCP_V4_H_ */
 | ||||
| diff -aurN linux-4.14.105/include/net/mptcp_v6.h mptcp-mptcp_v0.94/include/net/mptcp_v6.h
 | ||||
| --- linux-4.14.105/include/net/mptcp_v6.h	1970-01-01 01:00:00.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/mptcp_v6.h	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/mptcp_v6.h	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -0,0 +1,69 @@
 | ||||
| +/*
 | ||||
| + *	MPTCP implementation
 | ||||
|  | @ -1911,7 +1911,7 @@ diff -aurN linux-4.14.105/include/net/mptcp_v6.h mptcp-mptcp_v0.94/include/net/m | |||
| +#endif /* _MPTCP_V6_H */
 | ||||
| diff -aurN linux-4.14.105/include/net/net_namespace.h mptcp-mptcp_v0.94/include/net/net_namespace.h
 | ||||
| --- linux-4.14.105/include/net/net_namespace.h	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/net_namespace.h	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/net_namespace.h	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -18,6 +18,7 @@
 | ||||
|  #include <net/netns/packet.h> | ||||
|  #include <net/netns/ipv4.h> | ||||
|  | @ -1932,7 +1932,7 @@ diff -aurN linux-4.14.105/include/net/net_namespace.h mptcp-mptcp_v0.94/include/ | |||
|  #endif | ||||
| diff -aurN linux-4.14.105/include/net/netns/mptcp.h mptcp-mptcp_v0.94/include/net/netns/mptcp.h
 | ||||
| --- linux-4.14.105/include/net/netns/mptcp.h	1970-01-01 01:00:00.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/netns/mptcp.h	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/netns/mptcp.h	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -0,0 +1,52 @@
 | ||||
| +/*
 | ||||
| + *	MPTCP implementation - MPTCP namespace
 | ||||
|  | @ -1988,7 +1988,7 @@ diff -aurN linux-4.14.105/include/net/netns/mptcp.h mptcp-mptcp_v0.94/include/ne | |||
| +#endif /* __NETNS_MPTCP_H__ */
 | ||||
| diff -aurN linux-4.14.105/include/net/snmp.h mptcp-mptcp_v0.94/include/net/snmp.h
 | ||||
| --- linux-4.14.105/include/net/snmp.h	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/snmp.h	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/snmp.h	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -91,7 +91,6 @@
 | ||||
|  	atomic_long_t	mibs[ICMP6MSG_MIB_MAX]; | ||||
|  }; | ||||
|  | @ -1999,7 +1999,7 @@ diff -aurN linux-4.14.105/include/net/snmp.h mptcp-mptcp_v0.94/include/net/snmp. | |||
|  struct tcp_mib { | ||||
| diff -aurN linux-4.14.105/include/net/sock.h mptcp-mptcp_v0.94/include/net/sock.h
 | ||||
| --- linux-4.14.105/include/net/sock.h	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/sock.h	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/sock.h	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -775,6 +775,7 @@
 | ||||
|  	SOCK_FILTER_LOCKED, /* Filter cannot be changed anymore */ | ||||
|  	SOCK_SELECT_ERR_QUEUE, /* Wake select on error queue */ | ||||
|  | @ -2028,7 +2028,7 @@ diff -aurN linux-4.14.105/include/net/sock.h mptcp-mptcp_v0.94/include/net/sock. | |||
|  static inline bool sock_owned_by_user(const struct sock *sk) | ||||
| diff -aurN linux-4.14.105/include/net/tcp.h mptcp-mptcp_v0.94/include/net/tcp.h
 | ||||
| --- linux-4.14.105/include/net/tcp.h	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/tcp.h	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/tcp.h	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -185,6 +185,7 @@
 | ||||
|  #define TCPOPT_SACK             5       /* SACK Block */ | ||||
|  #define TCPOPT_TIMESTAMP	8	/* Better RTT estimations/PAWS */ | ||||
|  | @ -2381,7 +2381,7 @@ diff -aurN linux-4.14.105/include/net/tcp.h mptcp-mptcp_v0.94/include/net/tcp.h | |||
|  { | ||||
| diff -aurN linux-4.14.105/include/net/tcp_states.h mptcp-mptcp_v0.94/include/net/tcp_states.h
 | ||||
| --- linux-4.14.105/include/net/tcp_states.h	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/tcp_states.h	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/tcp_states.h	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -26,6 +26,7 @@
 | ||||
|  	TCP_LISTEN, | ||||
|  	TCP_CLOSING,	/* Now a valid state */ | ||||
|  | @ -2400,7 +2400,7 @@ diff -aurN linux-4.14.105/include/net/tcp_states.h mptcp-mptcp_v0.94/include/net | |||
|  #endif	/* _LINUX_TCP_STATES_H */ | ||||
| diff -aurN linux-4.14.105/include/net/transp_v6.h mptcp-mptcp_v0.94/include/net/transp_v6.h
 | ||||
| --- linux-4.14.105/include/net/transp_v6.h	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/transp_v6.h	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/net/transp_v6.h	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -59,6 +59,8 @@
 | ||||
|   | ||||
|  /* address family specific functions */ | ||||
|  | @ -2412,7 +2412,7 @@ diff -aurN linux-4.14.105/include/net/transp_v6.h mptcp-mptcp_v0.94/include/net/ | |||
|   | ||||
| diff -aurN linux-4.14.105/include/uapi/linux/if.h mptcp-mptcp_v0.94/include/uapi/linux/if.h
 | ||||
| --- linux-4.14.105/include/uapi/linux/if.h	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/uapi/linux/if.h	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/uapi/linux/if.h	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -132,6 +132,9 @@
 | ||||
|  #define IFF_ECHO			IFF_ECHO | ||||
|  #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ | ||||
|  | @ -2425,7 +2425,7 @@ diff -aurN linux-4.14.105/include/uapi/linux/if.h mptcp-mptcp_v0.94/include/uapi | |||
|   | ||||
| diff -aurN linux-4.14.105/include/uapi/linux/tcp.h mptcp-mptcp_v0.94/include/uapi/linux/tcp.h
 | ||||
| --- linux-4.14.105/include/uapi/linux/tcp.h	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/uapi/linux/tcp.h	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/include/uapi/linux/tcp.h	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -18,9 +18,15 @@
 | ||||
|  #ifndef _UAPI_LINUX_TCP_H | ||||
|  #define _UAPI_LINUX_TCP_H | ||||
|  | @ -2512,7 +2512,7 @@ diff -aurN linux-4.14.105/include/uapi/linux/tcp.h mptcp-mptcp_v0.94/include/uap | |||
|   | ||||
| diff -aurN linux-4.14.105/kernel/rcu/Kconfig.debug mptcp-mptcp_v0.94/kernel/rcu/Kconfig.debug
 | ||||
| --- linux-4.14.105/kernel/rcu/Kconfig.debug	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/kernel/rcu/Kconfig.debug	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/kernel/rcu/Kconfig.debug	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -4,9 +4,6 @@
 | ||||
|   | ||||
|  menu "RCU Debugging" | ||||
|  | @ -2525,7 +2525,7 @@ diff -aurN linux-4.14.105/kernel/rcu/Kconfig.debug mptcp-mptcp_v0.94/kernel/rcu/ | |||
|  	default n | ||||
| diff -aurN linux-4.14.105/net/core/dev.c mptcp-mptcp_v0.94/net/core/dev.c
 | ||||
| --- linux-4.14.105/net/core/dev.c	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/core/dev.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/core/dev.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -6766,7 +6766,7 @@
 | ||||
|   | ||||
|  	dev->flags = (flags & (IFF_DEBUG | IFF_NOTRAILERS | IFF_NOARP | | ||||
|  | @ -2537,7 +2537,7 @@ diff -aurN linux-4.14.105/net/core/dev.c mptcp-mptcp_v0.94/net/core/dev.c | |||
|   | ||||
| diff -aurN linux-4.14.105/net/core/skbuff.c mptcp-mptcp_v0.94/net/core/skbuff.c
 | ||||
| --- linux-4.14.105/net/core/skbuff.c	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/core/skbuff.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/core/skbuff.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -536,7 +536,7 @@
 | ||||
|  	skb_drop_list(&skb_shinfo(skb)->frag_list); | ||||
|  } | ||||
|  | @ -2558,7 +2558,7 @@ diff -aurN linux-4.14.105/net/core/skbuff.c mptcp-mptcp_v0.94/net/core/skbuff.c | |||
|   | ||||
| diff -aurN linux-4.14.105/net/core/sock.c mptcp-mptcp_v0.94/net/core/sock.c
 | ||||
| --- linux-4.14.105/net/core/sock.c	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/core/sock.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/core/sock.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -139,6 +139,11 @@
 | ||||
|   | ||||
|  #include <trace/events/sock.h> | ||||
|  | @ -2620,7 +2620,7 @@ diff -aurN linux-4.14.105/net/core/sock.c mptcp-mptcp_v0.94/net/core/sock.c | |||
|   | ||||
| diff -aurN linux-4.14.105/net/ipv4/af_inet.c mptcp-mptcp_v0.94/net/ipv4/af_inet.c
 | ||||
| --- linux-4.14.105/net/ipv4/af_inet.c	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/af_inet.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/af_inet.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -104,6 +104,7 @@
 | ||||
|  #include <net/ip_fib.h> | ||||
|  #include <net/inet_connection_sock.h> | ||||
|  | @ -2685,7 +2685,7 @@ diff -aurN linux-4.14.105/net/ipv4/af_inet.c mptcp-mptcp_v0.94/net/ipv4/af_inet. | |||
|   | ||||
| diff -aurN linux-4.14.105/net/ipv4/inet_connection_sock.c mptcp-mptcp_v0.94/net/ipv4/inet_connection_sock.c
 | ||||
| --- linux-4.14.105/net/ipv4/inet_connection_sock.c	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/inet_connection_sock.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/inet_connection_sock.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -23,6 +23,7 @@
 | ||||
|  #include <net/route.h> | ||||
|  #include <net/tcp_states.h> | ||||
|  | @ -2741,7 +2741,7 @@ diff -aurN linux-4.14.105/net/ipv4/inet_connection_sock.c mptcp-mptcp_v0.94/net/ | |||
|  		cond_resched(); | ||||
| diff -aurN linux-4.14.105/net/ipv4/ip_sockglue.c mptcp-mptcp_v0.94/net/ipv4/ip_sockglue.c
 | ||||
| --- linux-4.14.105/net/ipv4/ip_sockglue.c	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/ip_sockglue.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/ip_sockglue.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -44,6 +44,8 @@
 | ||||
|  #endif | ||||
|  #include <net/ip_fib.h> | ||||
|  | @ -2771,7 +2771,7 @@ diff -aurN linux-4.14.105/net/ipv4/ip_sockglue.c mptcp-mptcp_v0.94/net/ipv4/ip_s | |||
|  	case IP_TTL: | ||||
| diff -aurN linux-4.14.105/net/ipv4/Kconfig mptcp-mptcp_v0.94/net/ipv4/Kconfig
 | ||||
| --- linux-4.14.105/net/ipv4/Kconfig	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/Kconfig	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/Kconfig	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -675,6 +675,38 @@
 | ||||
|  	bufferbloat, policers, or AQM schemes that do not provide a delay | ||||
|  	signal. It requires the fq ("Fair Queue") pacing packet scheduler. | ||||
|  | @ -2843,7 +2843,7 @@ diff -aurN linux-4.14.105/net/ipv4/Kconfig mptcp-mptcp_v0.94/net/ipv4/Kconfig | |||
|  	default "cdg" if DEFAULT_CDG | ||||
| diff -aurN linux-4.14.105/net/ipv4/syncookies.c mptcp-mptcp_v0.94/net/ipv4/syncookies.c
 | ||||
| --- linux-4.14.105/net/ipv4/syncookies.c	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/syncookies.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/syncookies.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -16,6 +16,8 @@
 | ||||
|  #include <linux/siphash.h> | ||||
|  #include <linux/kernel.h> | ||||
|  | @ -2958,7 +2958,7 @@ diff -aurN linux-4.14.105/net/ipv4/syncookies.c mptcp-mptcp_v0.94/net/ipv4/synco | |||
|  	ireq->ecn_ok = cookie_ecn_ok(&tcp_opt, sock_net(sk), &rt->dst); | ||||
| diff -aurN linux-4.14.105/net/ipv4/tcp.c mptcp-mptcp_v0.94/net/ipv4/tcp.c
 | ||||
| --- linux-4.14.105/net/ipv4/tcp.c	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/tcp.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/tcp.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -273,6 +273,7 @@
 | ||||
|   | ||||
|  #include <net/icmp.h> | ||||
|  | @ -3655,7 +3655,7 @@ diff -aurN linux-4.14.105/net/ipv4/tcp.c mptcp-mptcp_v0.94/net/ipv4/tcp.c | |||
|  EXPORT_SYMBOL_GPL(tcp_abort); | ||||
| diff -aurN linux-4.14.105/net/ipv4/tcp_diag.c mptcp-mptcp_v0.94/net/ipv4/tcp_diag.c
 | ||||
| --- linux-4.14.105/net/ipv4/tcp_diag.c	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/tcp_diag.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/tcp_diag.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -34,7 +34,7 @@
 | ||||
|  		r->idiag_wqueue = tp->write_seq - tp->snd_una; | ||||
|  	} | ||||
|  | @ -3667,7 +3667,7 @@ diff -aurN linux-4.14.105/net/ipv4/tcp_diag.c mptcp-mptcp_v0.94/net/ipv4/tcp_dia | |||
|  #ifdef CONFIG_TCP_MD5SIG | ||||
| diff -aurN linux-4.14.105/net/ipv4/tcp_fastopen.c mptcp-mptcp_v0.94/net/ipv4/tcp_fastopen.c
 | ||||
| --- linux-4.14.105/net/ipv4/tcp_fastopen.c	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/tcp_fastopen.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/tcp_fastopen.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -9,6 +9,7 @@
 | ||||
|  #include <linux/rculist.h> | ||||
|  #include <net/inetpeer.h> | ||||
|  | @ -3728,7 +3728,7 @@ diff -aurN linux-4.14.105/net/ipv4/tcp_fastopen.c mptcp-mptcp_v0.94/net/ipv4/tcp | |||
|  	 */ | ||||
| diff -aurN linux-4.14.105/net/ipv4/tcp_input.c mptcp-mptcp_v0.94/net/ipv4/tcp_input.c
 | ||||
| --- linux-4.14.105/net/ipv4/tcp_input.c	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/tcp_input.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/tcp_input.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -76,6 +76,9 @@
 | ||||
|  #include <linux/ipsec.h> | ||||
|  #include <asm/unaligned.h> | ||||
|  | @ -4577,7 +4577,7 @@ diff -aurN linux-4.14.105/net/ipv4/tcp_input.c mptcp-mptcp_v0.94/net/ipv4/tcp_in | |||
|  		tcp_rsk(req)->tfo_listener = false; | ||||
| diff -aurN linux-4.14.105/net/ipv4/tcp_ipv4.c mptcp-mptcp_v0.94/net/ipv4/tcp_ipv4.c
 | ||||
| --- linux-4.14.105/net/ipv4/tcp_ipv4.c	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/tcp_ipv4.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/tcp_ipv4.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -67,6 +67,8 @@
 | ||||
|  #include <net/icmp.h> | ||||
|  #include <net/inet_hashtables.h> | ||||
|  | @ -5067,7 +5067,7 @@ diff -aurN linux-4.14.105/net/ipv4/tcp_ipv4.c mptcp-mptcp_v0.94/net/ipv4/tcp_ipv | |||
|   | ||||
| diff -aurN linux-4.14.105/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.94/net/ipv4/tcp_minisocks.c
 | ||||
| --- linux-4.14.105/net/ipv4/tcp_minisocks.c	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/tcp_minisocks.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/tcp_minisocks.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -18,11 +18,13 @@
 | ||||
|   *		Jorge Cwik, <jorge@laser.satlink.net> | ||||
|   */ | ||||
|  | @ -5280,7 +5280,7 @@ diff -aurN linux-4.14.105/net/ipv4/tcp_minisocks.c mptcp-mptcp_v0.94/net/ipv4/tc | |||
|  } | ||||
| diff -aurN linux-4.14.105/net/ipv4/tcp_output.c mptcp-mptcp_v0.94/net/ipv4/tcp_output.c
 | ||||
| --- linux-4.14.105/net/ipv4/tcp_output.c	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/tcp_output.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/tcp_output.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -36,6 +36,12 @@
 | ||||
|   | ||||
|  #define pr_fmt(fmt) "TCP: " fmt | ||||
|  | @ -5907,7 +5907,7 @@ diff -aurN linux-4.14.105/net/ipv4/tcp_output.c mptcp-mptcp_v0.94/net/ipv4/tcp_o | |||
|  		/* Cancel probe timer, if it is not required. */ | ||||
| diff -aurN linux-4.14.105/net/ipv4/tcp_timer.c mptcp-mptcp_v0.94/net/ipv4/tcp_timer.c
 | ||||
| --- linux-4.14.105/net/ipv4/tcp_timer.c	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/tcp_timer.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv4/tcp_timer.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -20,6 +20,7 @@
 | ||||
|   | ||||
|  #include <linux/module.h> | ||||
|  | @ -6107,7 +6107,7 @@ diff -aurN linux-4.14.105/net/ipv4/tcp_timer.c mptcp-mptcp_v0.94/net/ipv4/tcp_ti | |||
|   | ||||
| diff -aurN linux-4.14.105/net/ipv6/addrconf.c mptcp-mptcp_v0.94/net/ipv6/addrconf.c
 | ||||
| --- linux-4.14.105/net/ipv6/addrconf.c	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv6/addrconf.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv6/addrconf.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -928,6 +928,7 @@
 | ||||
|   | ||||
|  	kfree_rcu(ifp, rcu); | ||||
|  | @ -6118,7 +6118,7 @@ diff -aurN linux-4.14.105/net/ipv6/addrconf.c mptcp-mptcp_v0.94/net/ipv6/addrcon | |||
|  ipv6_link_dev_addr(struct inet6_dev *idev, struct inet6_ifaddr *ifp) | ||||
| diff -aurN linux-4.14.105/net/ipv6/af_inet6.c mptcp-mptcp_v0.94/net/ipv6/af_inet6.c
 | ||||
| --- linux-4.14.105/net/ipv6/af_inet6.c	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv6/af_inet6.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv6/af_inet6.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -107,8 +107,7 @@
 | ||||
|  	return (struct ipv6_pinfo *)(((u8 *)sk) + offset); | ||||
|  } | ||||
|  | @ -6131,7 +6131,7 @@ diff -aurN linux-4.14.105/net/ipv6/af_inet6.c mptcp-mptcp_v0.94/net/ipv6/af_inet | |||
|  	struct ipv6_pinfo *np; | ||||
| diff -aurN linux-4.14.105/net/ipv6/ipv6_sockglue.c mptcp-mptcp_v0.94/net/ipv6/ipv6_sockglue.c
 | ||||
| --- linux-4.14.105/net/ipv6/ipv6_sockglue.c	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv6/ipv6_sockglue.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv6/ipv6_sockglue.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -48,6 +48,8 @@
 | ||||
|  #include <net/addrconf.h> | ||||
|  #include <net/inet_common.h> | ||||
|  | @ -6157,7 +6157,7 @@ diff -aurN linux-4.14.105/net/ipv6/ipv6_sockglue.c mptcp-mptcp_v0.94/net/ipv6/ip | |||
|  				tcp_sync_mss(sk, icsk->icsk_pmtu_cookie); | ||||
| diff -aurN linux-4.14.105/net/ipv6/syncookies.c mptcp-mptcp_v0.94/net/ipv6/syncookies.c
 | ||||
| --- linux-4.14.105/net/ipv6/syncookies.c	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv6/syncookies.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv6/syncookies.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -20,6 +20,8 @@
 | ||||
|  #include <linux/kernel.h> | ||||
|  #include <net/secure_seq.h> | ||||
|  | @ -6241,7 +6241,7 @@ diff -aurN linux-4.14.105/net/ipv6/syncookies.c mptcp-mptcp_v0.94/net/ipv6/synco | |||
|  	ireq->ecn_ok = cookie_ecn_ok(&tcp_opt, sock_net(sk), dst); | ||||
| diff -aurN linux-4.14.105/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.94/net/ipv6/tcp_ipv6.c
 | ||||
| --- linux-4.14.105/net/ipv6/tcp_ipv6.c	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv6/tcp_ipv6.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/ipv6/tcp_ipv6.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -61,6 +61,8 @@
 | ||||
|  #include <net/timewait_sock.h> | ||||
|  #include <net/inet_common.h> | ||||
|  | @ -6865,7 +6865,7 @@ diff -aurN linux-4.14.105/net/ipv6/tcp_ipv6.c mptcp-mptcp_v0.94/net/ipv6/tcp_ipv | |||
|  /* thinking of making this const? Don't. | ||||
| diff -aurN linux-4.14.105/net/Kconfig mptcp-mptcp_v0.94/net/Kconfig
 | ||||
| --- linux-4.14.105/net/Kconfig	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/Kconfig	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/Kconfig	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -88,6 +88,7 @@
 | ||||
|  source "net/ipv4/Kconfig" | ||||
|  source "net/ipv6/Kconfig" | ||||
|  | @ -6876,7 +6876,7 @@ diff -aurN linux-4.14.105/net/Kconfig mptcp-mptcp_v0.94/net/Kconfig | |||
|   | ||||
| diff -aurN linux-4.14.105/net/Makefile mptcp-mptcp_v0.94/net/Makefile
 | ||||
| --- linux-4.14.105/net/Makefile	2019-03-05 17:58:03.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/Makefile	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/Makefile	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -20,6 +20,7 @@
 | ||||
|  obj-$(CONFIG_XFRM)		+= xfrm/ | ||||
|  obj-$(CONFIG_UNIX)		+= unix/ | ||||
|  | @ -6887,7 +6887,7 @@ diff -aurN linux-4.14.105/net/Makefile mptcp-mptcp_v0.94/net/Makefile | |||
|  obj-$(CONFIG_BRIDGE)		+= bridge/ | ||||
| diff -aurN linux-4.14.105/net/mptcp/Kconfig mptcp-mptcp_v0.94/net/mptcp/Kconfig
 | ||||
| --- linux-4.14.105/net/mptcp/Kconfig	1970-01-01 01:00:00.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/Kconfig	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/Kconfig	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -0,0 +1,129 @@
 | ||||
| +#
 | ||||
| +# MPTCP configuration
 | ||||
|  | @ -7020,7 +7020,7 @@ diff -aurN linux-4.14.105/net/mptcp/Kconfig mptcp-mptcp_v0.94/net/mptcp/Kconfig | |||
| +
 | ||||
| diff -aurN linux-4.14.105/net/mptcp/Makefile mptcp-mptcp_v0.94/net/mptcp/Makefile
 | ||||
| --- linux-4.14.105/net/mptcp/Makefile	1970-01-01 01:00:00.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/Makefile	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/Makefile	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -0,0 +1,22 @@
 | ||||
| +#
 | ||||
| +## Makefile for MultiPath TCP support code.
 | ||||
|  | @ -7046,7 +7046,7 @@ diff -aurN linux-4.14.105/net/mptcp/Makefile mptcp-mptcp_v0.94/net/mptcp/Makefil | |||
| +
 | ||||
| diff -aurN linux-4.14.105/net/mptcp/mptcp_balia.c mptcp-mptcp_v0.94/net/mptcp/mptcp_balia.c
 | ||||
| --- linux-4.14.105/net/mptcp/mptcp_balia.c	1970-01-01 01:00:00.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_balia.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_balia.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -0,0 +1,268 @@
 | ||||
| +/*
 | ||||
| + *	MPTCP implementation - Balia Congestion Control
 | ||||
|  | @ -7318,7 +7318,7 @@ diff -aurN linux-4.14.105/net/mptcp/mptcp_balia.c mptcp-mptcp_v0.94/net/mptcp/mp | |||
| +MODULE_VERSION("0.1");
 | ||||
| diff -aurN linux-4.14.105/net/mptcp/mptcp_binder.c mptcp-mptcp_v0.94/net/mptcp/mptcp_binder.c
 | ||||
| --- linux-4.14.105/net/mptcp/mptcp_binder.c	1970-01-01 01:00:00.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_binder.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_binder.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -0,0 +1,486 @@
 | ||||
| +#include <linux/module.h>
 | ||||
| +
 | ||||
|  | @ -7808,7 +7808,7 @@ diff -aurN linux-4.14.105/net/mptcp/mptcp_binder.c mptcp-mptcp_v0.94/net/mptcp/m | |||
| +MODULE_VERSION("0.1");
 | ||||
| diff -aurN linux-4.14.105/net/mptcp/mptcp_coupled.c mptcp-mptcp_v0.94/net/mptcp/mptcp_coupled.c
 | ||||
| --- linux-4.14.105/net/mptcp/mptcp_coupled.c	1970-01-01 01:00:00.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_coupled.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_coupled.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -0,0 +1,271 @@
 | ||||
| +/*
 | ||||
| + *	MPTCP implementation - Linked Increase congestion control Algorithm (LIA)
 | ||||
|  | @ -8083,7 +8083,7 @@ diff -aurN linux-4.14.105/net/mptcp/mptcp_coupled.c mptcp-mptcp_v0.94/net/mptcp/ | |||
| +MODULE_VERSION("0.1");
 | ||||
| diff -aurN linux-4.14.105/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.94/net/mptcp/mptcp_ctrl.c
 | ||||
| --- linux-4.14.105/net/mptcp/mptcp_ctrl.c	1970-01-01 01:00:00.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ctrl.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ctrl.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -0,0 +1,2968 @@
 | ||||
| +/*
 | ||||
| + *	MPTCP implementation - MPTCP-control
 | ||||
|  | @ -11055,7 +11055,7 @@ diff -aurN linux-4.14.105/net/mptcp/mptcp_ctrl.c mptcp-mptcp_v0.94/net/mptcp/mpt | |||
| +}
 | ||||
| diff -aurN linux-4.14.105/net/mptcp/mptcp_fullmesh.c mptcp-mptcp_v0.94/net/mptcp/mptcp_fullmesh.c
 | ||||
| --- linux-4.14.105/net/mptcp/mptcp_fullmesh.c	1970-01-01 01:00:00.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_fullmesh.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_fullmesh.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -0,0 +1,2013 @@
 | ||||
| +#include <linux/module.h>
 | ||||
| +#include <linux/proc_fs.h>
 | ||||
|  | @ -13072,8 +13072,8 @@ diff -aurN linux-4.14.105/net/mptcp/mptcp_fullmesh.c mptcp-mptcp_v0.94/net/mptcp | |||
| +MODULE_VERSION("0.88");
 | ||||
| diff -aurN linux-4.14.105/net/mptcp/mptcp_input.c mptcp-mptcp_v0.94/net/mptcp/mptcp_input.c
 | ||||
| --- linux-4.14.105/net/mptcp/mptcp_input.c	1970-01-01 01:00:00.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_input.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| @@ -0,0 +1,2466 @@
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_input.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -0,0 +1,2475 @@
 | ||||
| +/*
 | ||||
| + *	MPTCP implementation - Sending side
 | ||||
| + *
 | ||||
|  | @ -13361,10 +13361,16 @@ diff -aurN linux-4.14.105/net/mptcp/mptcp_input.c mptcp-mptcp_v0.94/net/mptcp/mp | |||
| +	__wsum csum_tcp = 0; /* cumulative checksum of pld + mptcp-header */
 | ||||
| +	int ans = 1, overflowed = 0, offset = 0, dss_csum_added = 0;
 | ||||
| +	int iter = 0;
 | ||||
| +	u32 next_seq, offset_seq;
 | ||||
| +
 | ||||
| +	skb_queue_walk_safe(&sk->sk_receive_queue, tmp, tmp1) {
 | ||||
| +		unsigned int csum_len;
 | ||||
| +
 | ||||
| +		/* init next seq in first round  */
 | ||||
| +		if (!iter)
 | ||||
| +			next_seq = TCP_SKB_CB(tmp)->seq;
 | ||||
| +		offset_seq = next_seq - TCP_SKB_CB(tmp)->seq;
 | ||||
| +
 | ||||
| +		if (before(tp->mptcp->map_subseq + tp->mptcp->map_data_len, TCP_SKB_CB(tmp)->end_seq))
 | ||||
| +			/* Mapping ends in the middle of the packet -
 | ||||
| +			 * csum only these bytes
 | ||||
|  | @ -13373,20 +13379,22 @@ diff -aurN linux-4.14.105/net/mptcp/mptcp_input.c mptcp-mptcp_v0.94/net/mptcp/mp | |||
| +		else
 | ||||
| +			csum_len = tmp->len;
 | ||||
| +
 | ||||
| +		csum_len -= offset_seq;
 | ||||
| +		offset = 0;
 | ||||
| +		if (overflowed) {
 | ||||
| +			char first_word[4];
 | ||||
| +			first_word[0] = 0;
 | ||||
| +			first_word[1] = 0;
 | ||||
| +			first_word[2] = 0;
 | ||||
| +			first_word[3] = *(tmp->data);
 | ||||
| +			first_word[3] = *(tmp->data + offset_seq);
 | ||||
| +			csum_tcp = csum_partial(first_word, 4, csum_tcp);
 | ||||
| +			offset = 1;
 | ||||
| +			csum_len--;
 | ||||
| +			overflowed = 0;
 | ||||
| +		}
 | ||||
| +
 | ||||
| +		csum_tcp = skb_checksum(tmp, offset, csum_len, csum_tcp);
 | ||||
| +		csum_tcp = skb_checksum(tmp, offset + offset_seq, csum_len,
 | ||||
| +					csum_tcp);
 | ||||
| +
 | ||||
| +		/* Was it on an odd-length? Then we have to merge the next byte
 | ||||
| +		 * correctly (see above)
 | ||||
|  | @ -13422,6 +13430,7 @@ diff -aurN linux-4.14.105/net/mptcp/mptcp_input.c mptcp-mptcp_v0.94/net/mptcp/mp | |||
| +		    !before(TCP_SKB_CB(tmp1)->seq,
 | ||||
| +			    tp->mptcp->map_subseq + tp->mptcp->map_data_len))
 | ||||
| +			break;
 | ||||
| +		next_seq = TCP_SKB_CB(tmp)->end_seq;
 | ||||
| +	}
 | ||||
| +
 | ||||
| +	/* Now, checksum must be 0 */
 | ||||
|  | @ -15542,7 +15551,7 @@ diff -aurN linux-4.14.105/net/mptcp/mptcp_input.c mptcp-mptcp_v0.94/net/mptcp/mp | |||
| +}
 | ||||
| diff -aurN linux-4.14.105/net/mptcp/mptcp_ipv4.c mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv4.c
 | ||||
| --- linux-4.14.105/net/mptcp/mptcp_ipv4.c	1970-01-01 01:00:00.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv4.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv4.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -0,0 +1,436 @@
 | ||||
| +/*
 | ||||
| + *	MPTCP implementation - IPv4-specific functions
 | ||||
|  | @ -15982,7 +15991,7 @@ diff -aurN linux-4.14.105/net/mptcp/mptcp_ipv4.c mptcp-mptcp_v0.94/net/mptcp/mpt | |||
| +}
 | ||||
| diff -aurN linux-4.14.105/net/mptcp/mptcp_ipv6.c mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv6.c
 | ||||
| --- linux-4.14.105/net/mptcp/mptcp_ipv6.c	1970-01-01 01:00:00.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv6.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ipv6.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -0,0 +1,465 @@
 | ||||
| +/*
 | ||||
| + *	MPTCP implementation - IPv6-specific functions
 | ||||
|  | @ -16451,7 +16460,7 @@ diff -aurN linux-4.14.105/net/mptcp/mptcp_ipv6.c mptcp-mptcp_v0.94/net/mptcp/mpt | |||
| +}
 | ||||
| diff -aurN linux-4.14.105/net/mptcp/mptcp_ndiffports.c mptcp-mptcp_v0.94/net/mptcp/mptcp_ndiffports.c
 | ||||
| --- linux-4.14.105/net/mptcp/mptcp_ndiffports.c	1970-01-01 01:00:00.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ndiffports.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_ndiffports.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -0,0 +1,169 @@
 | ||||
| +#include <linux/module.h>
 | ||||
| +
 | ||||
|  | @ -16624,7 +16633,7 @@ diff -aurN linux-4.14.105/net/mptcp/mptcp_ndiffports.c mptcp-mptcp_v0.94/net/mpt | |||
| +MODULE_VERSION("0.88");
 | ||||
| diff -aurN linux-4.14.105/net/mptcp/mptcp_olia.c mptcp-mptcp_v0.94/net/mptcp/mptcp_olia.c
 | ||||
| --- linux-4.14.105/net/mptcp/mptcp_olia.c	1970-01-01 01:00:00.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_olia.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_olia.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -0,0 +1,310 @@
 | ||||
| +/*
 | ||||
| + * MPTCP implementation - OPPORTUNISTIC LINKED INCREASES CONGESTION CONTROL:
 | ||||
|  | @ -16938,7 +16947,7 @@ diff -aurN linux-4.14.105/net/mptcp/mptcp_olia.c mptcp-mptcp_v0.94/net/mptcp/mpt | |||
| +MODULE_VERSION("0.1");
 | ||||
| diff -aurN linux-4.14.105/net/mptcp/mptcp_output.c mptcp-mptcp_v0.94/net/mptcp/mptcp_output.c
 | ||||
| --- linux-4.14.105/net/mptcp/mptcp_output.c	1970-01-01 01:00:00.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_output.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_output.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -0,0 +1,1816 @@
 | ||||
| +/*
 | ||||
| + *	MPTCP implementation - Sending side
 | ||||
|  | @ -18758,7 +18767,7 @@ diff -aurN linux-4.14.105/net/mptcp/mptcp_output.c mptcp-mptcp_v0.94/net/mptcp/m | |||
| +
 | ||||
| diff -aurN linux-4.14.105/net/mptcp/mptcp_pm.c mptcp-mptcp_v0.94/net/mptcp/mptcp_pm.c
 | ||||
| --- linux-4.14.105/net/mptcp/mptcp_pm.c	1970-01-01 01:00:00.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_pm.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_pm.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -0,0 +1,226 @@
 | ||||
| +/*
 | ||||
| + *     MPTCP implementation - MPTCP-subflow-management
 | ||||
|  | @ -18988,7 +18997,7 @@ diff -aurN linux-4.14.105/net/mptcp/mptcp_pm.c mptcp-mptcp_v0.94/net/mptcp/mptcp | |||
| +late_initcall(mptcp_path_manager_default);
 | ||||
| diff -aurN linux-4.14.105/net/mptcp/mptcp_redundant.c mptcp-mptcp_v0.94/net/mptcp/mptcp_redundant.c
 | ||||
| --- linux-4.14.105/net/mptcp/mptcp_redundant.c	1970-01-01 01:00:00.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_redundant.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_redundant.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -0,0 +1,301 @@
 | ||||
| +/*
 | ||||
| + *	MPTCP Scheduler to reduce latency and jitter.
 | ||||
|  | @ -19293,7 +19302,7 @@ diff -aurN linux-4.14.105/net/mptcp/mptcp_redundant.c mptcp-mptcp_v0.94/net/mptc | |||
| +MODULE_VERSION("0.90");
 | ||||
| diff -aurN linux-4.14.105/net/mptcp/mptcp_rr.c mptcp-mptcp_v0.94/net/mptcp/mptcp_rr.c
 | ||||
| --- linux-4.14.105/net/mptcp/mptcp_rr.c	1970-01-01 01:00:00.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_rr.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_rr.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -0,0 +1,301 @@
 | ||||
| +/* MPTCP Scheduler module selector. Highly inspired by tcp_cong.c */
 | ||||
| +
 | ||||
|  | @ -19598,7 +19607,7 @@ diff -aurN linux-4.14.105/net/mptcp/mptcp_rr.c mptcp-mptcp_v0.94/net/mptcp/mptcp | |||
| +MODULE_VERSION("0.89");
 | ||||
| diff -aurN linux-4.14.105/net/mptcp/mptcp_sched.c mptcp-mptcp_v0.94/net/mptcp/mptcp_sched.c
 | ||||
| --- linux-4.14.105/net/mptcp/mptcp_sched.c	1970-01-01 01:00:00.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_sched.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_sched.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -0,0 +1,634 @@
 | ||||
| +/* MPTCP Scheduler module selector. Highly inspired by tcp_cong.c */
 | ||||
| +
 | ||||
|  | @ -20236,7 +20245,7 @@ diff -aurN linux-4.14.105/net/mptcp/mptcp_sched.c mptcp-mptcp_v0.94/net/mptcp/mp | |||
| +late_initcall(mptcp_scheduler_default);
 | ||||
| diff -aurN linux-4.14.105/net/mptcp/mptcp_wvegas.c mptcp-mptcp_v0.94/net/mptcp/mptcp_wvegas.c
 | ||||
| --- linux-4.14.105/net/mptcp/mptcp_wvegas.c	1970-01-01 01:00:00.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_wvegas.c	2019-03-09 01:52:04.000000000 +0100
 | ||||
| +++ mptcp-mptcp_v0.94/net/mptcp/mptcp_wvegas.c	2019-03-12 01:27:21.000000000 +0100
 | ||||
| @@ -0,0 +1,270 @@
 | ||||
| +/*
 | ||||
| + *	MPTCP implementation - WEIGHTED VEGAS
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue