Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9bd2653 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.52 into android-4.19 



Changes in 4.19.52
	tcp: limit payload size of sacked skbs
	tcp: tcp_fragment() should apply sane memory limits
	tcp: add tcp_min_snd_mss sysctl
	tcp: enforce tcp_min_snd_mss in tcp_mtu_probing()
	Linux 4.19.52

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents d1f7f3be 6500aa43

Documentation/networking/ip-sysctl.txt

+8 −0
Original line number Diff line number Diff line
@@ -250,6 +250,14 @@ tcp_base_mss - INTEGER 
	Path MTU discovery (MTU probing).  If MTU probing is enabled,

	this is the initial MSS used by the connection.



tcp_min_snd_mss - INTEGER

	TCP SYN and SYNACK messages usually advertise an ADVMSS option,

	as described in RFC 1122 and RFC 6691.

	If this ADVMSS option is smaller than tcp_min_snd_mss,

	it is silently capped to tcp_min_snd_mss.



	Default : 48 (at least 8 bytes of payload per segment)



tcp_congestion_control - STRING

	Set the congestion control algorithm to be used for new

	connections. The algorithm "reno" is always available, but

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 51

SUBLEVEL = 52

EXTRAVERSION =

NAME = "People's Front"

include/linux/tcp.h

+4 −0
Original line number Diff line number Diff line
@@ -485,4 +485,8 @@ static inline u16 tcp_mss_clamp(const struct tcp_sock *tp, u16 mss) 


	return (user_mss && user_mss < mss) ? user_mss : mss;

}



int tcp_skb_shift(struct sk_buff *to, struct sk_buff *from, int pcount,

		  int shiftlen);



#endif	/* _LINUX_TCP_H */

include/net/netns/ipv4.h

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ struct netns_ipv4 { 
#endif

	int sysctl_tcp_mtu_probing;

	int sysctl_tcp_base_mss;

	int sysctl_tcp_min_snd_mss;

	int sysctl_tcp_probe_threshold;

	u32 sysctl_tcp_probe_interval;

include/net/tcp.h

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ void tcp_time_wait(struct sock *sk, int state, int timeo); 


#define MAX_TCP_HEADER	(128 + MAX_HEADER)

#define MAX_TCP_OPTION_SPACE 40

#define TCP_MIN_SND_MSS		48

#define TCP_MIN_GSO_SIZE	(TCP_MIN_SND_MSS - MAX_TCP_OPTION_SPACE)



/*

 * Never offer a window over 32767 without using window scaling. Some