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

Commit ceef9ab6 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp: Namespace-ify sysctl_tcp_workaround_signed_windows 



Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d06a9904

include/net/netns/ipv4.h

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ struct netns_ipv4 { 
	int sysctl_tcp_nometrics_save;

	int sysctl_tcp_moderate_rcvbuf;

	int sysctl_tcp_tso_win_divisor;

	int sysctl_tcp_workaround_signed_windows;

	struct inet_timewait_death_row tcp_death_row;

	int sysctl_max_syn_backlog;

	int sysctl_tcp_fastopen;

include/net/tcp.h

+2 −2
Original line number Diff line number Diff line
@@ -247,7 +247,6 @@ extern int sysctl_tcp_max_orphans; 
extern long sysctl_tcp_mem[3];

extern int sysctl_tcp_wmem[3];

extern int sysctl_tcp_rmem[3];

extern int sysctl_tcp_workaround_signed_windows;



#define TCP_RACK_LOSS_DETECTION  0x1 /* Use RACK to detect losses */
@@ -1302,7 +1301,8 @@ static inline void tcp_slow_start_after_idle_check(struct sock *sk) 
}



/* Determine a window scaling and initial window to offer. */

void tcp_select_initial_window(int __space, __u32 mss, __u32 *rcv_wnd,

void tcp_select_initial_window(const struct sock *sk, int __space,

			       __u32 mss, __u32 *rcv_wnd,

			       __u32 *window_clamp, int wscale_ok,

			       __u8 *rcv_wscale, __u32 init_rcv_wnd);

net/ipv4/syncookies.c

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb) 
	/* Try to redo what tcp_v4_send_synack did. */

	req->rsk_window_clamp = tp->window_clamp ? :dst_metric(&rt->dst, RTAX_WINDOW);



	tcp_select_initial_window(tcp_full_space(sk), req->mss,

	tcp_select_initial_window(sk, tcp_full_space(sk), req->mss,

				  &req->rsk_rcv_wnd, &req->rsk_window_clamp,

				  ireq->wscale_ok, &rcv_wscale,

				  dst_metric(&rt->dst, RTAX_INITRWND));

net/ipv4/sysctl_net_ipv4.c

+7 −7
Original line number Diff line number Diff line
@@ -457,13 +457,6 @@ static struct ctl_table ipv4_table[] = { 
		.maxlen		= TCP_CA_NAME_MAX,

		.proc_handler	= proc_tcp_congestion_control,

	},

	{

		.procname	= "tcp_workaround_signed_windows",

		.data		= &sysctl_tcp_workaround_signed_windows,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_limit_output_bytes",

		.data		= &sysctl_tcp_limit_output_bytes,
@@ -1145,6 +1138,13 @@ static struct ctl_table ipv4_net_table[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

	{

		.procname	= "tcp_workaround_signed_windows",

		.data		= &init_net.ipv4.sysctl_tcp_workaround_signed_windows,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{ }

};

net/ipv4/tcp_minisocks.c

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ void tcp_openreq_init_rwin(struct request_sock *req, 
		full_space = rcv_wnd * mss;



	/* tcp_full_space because it is guaranteed to be the first packet */

	tcp_select_initial_window(full_space,

	tcp_select_initial_window(sk_listener, full_space,

		mss - (ireq->tstamp_ok ? TCPOLEN_TSTAMP_ALIGNED : 0),

		&req->rsk_rcv_wnd,

		&req->rsk_window_clamp,