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

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

Merge 4.4.182 into android-4.4 



Changes in 4.4.182
	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.4.182

Change-Id: I2698fa2ad3884a20d936e6bee638304f52df19bd
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 1cc130f9 33790f2e

Documentation/networking/ip-sysctl.txt

+8 −0
Original line number Diff line number Diff line
@@ -220,6 +220,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 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 181

SUBLEVEL = 182

EXTRAVERSION =

NAME = Blurry Fish Butt

include/linux/tcp.h

+3 −0
Original line number Diff line number Diff line
@@ -419,4 +419,7 @@ static inline void tcp_saved_syn_free(struct tcp_sock *tp) 
	tp->saved_syn = NULL;

}



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
@@ -88,6 +88,7 @@ struct netns_ipv4 { 
	int sysctl_tcp_fwmark_accept;

	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
@@ -54,6 +54,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