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

Commit ca2eb567 authored Feb 05, 2013 by Stephen Hemminger Committed by David S. Miller Feb 05, 2013

tcp: remove Appropriate Byte Count support



TCP Appropriate Byte Count was added by me, but later disabled.
There is no point in maintaining it since it is a potential source
of bugs and Linux already implements other better window protection
heuristics.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 547472b8

Documentation/networking/ip-sysctl.txt

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -130,17 +130,6 @@ somaxconn - INTEGER
	Defaults to 128. See also tcp_max_syn_backlog for additional tuning		Defaults to 128. See also tcp_max_syn_backlog for additional tuning
	for TCP sockets.		for TCP sockets.

	tcp_abc - INTEGER
	Controls Appropriate Byte Count (ABC) defined in RFC3465.
	ABC is a way of increasing congestion window (cwnd) more slowly
	in response to partial acknowledgments.
	Possible values are:
	0 increase cwnd once per acknowledgment (no ABC)
	1 increase cwnd once per acknowledgment of full sized segment
	2 allow increase cwnd by two if acknowledgment is
	of two segments to compensate for delayed acknowledgments.
	Default: 0 (off)

	tcp_abort_on_overflow - BOOLEAN		tcp_abort_on_overflow - BOOLEAN
	If listening service is too slow to accept new connections,		If listening service is too slow to accept new connections,
	reset them. Default state is FALSE. It means that if overflow		reset them. Default state is FALSE. It means that if overflow

include/linux/tcp.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -246,7 +246,6 @@ struct tcp_sock {
	u32 sacked_out; /* SACK'd packets */		u32 sacked_out; /* SACK'd packets */
	u32 fackets_out; /* FACK'd packets */		u32 fackets_out; /* FACK'd packets */
	u32 tso_deferred;		u32 tso_deferred;
	u32 bytes_acked; /* Appropriate Byte Counting - RFC3465 */

	/* from STCP, retrans queue hinting */		/* from STCP, retrans queue hinting */
	struct sk_buff* lost_skb_hint;		struct sk_buff* lost_skb_hint;

include/net/tcp.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -279,7 +279,6 @@ extern int sysctl_tcp_dma_copybreak;
	extern int sysctl_tcp_nometrics_save;		extern int sysctl_tcp_nometrics_save;
	extern int sysctl_tcp_moderate_rcvbuf;		extern int sysctl_tcp_moderate_rcvbuf;
	extern int sysctl_tcp_tso_win_divisor;		extern int sysctl_tcp_tso_win_divisor;
	extern int sysctl_tcp_abc;
	extern int sysctl_tcp_mtu_probing;		extern int sysctl_tcp_mtu_probing;
	extern int sysctl_tcp_base_mss;		extern int sysctl_tcp_base_mss;
	extern int sysctl_tcp_workaround_signed_windows;		extern int sysctl_tcp_workaround_signed_windows;

kernel/sysctl_binary.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -387,7 +387,6 @@ static const struct bin_table bin_net_ipv4_table[] = {
	{ CTL_INT, NET_TCP_MODERATE_RCVBUF, "tcp_moderate_rcvbuf" },		{ CTL_INT, NET_TCP_MODERATE_RCVBUF, "tcp_moderate_rcvbuf" },
	{ CTL_INT, NET_TCP_TSO_WIN_DIVISOR, "tcp_tso_win_divisor" },		{ CTL_INT, NET_TCP_TSO_WIN_DIVISOR, "tcp_tso_win_divisor" },
	{ CTL_STR, NET_TCP_CONG_CONTROL, "tcp_congestion_control" },		{ CTL_STR, NET_TCP_CONG_CONTROL, "tcp_congestion_control" },
	{ CTL_INT, NET_TCP_ABC, "tcp_abc" },
	{ CTL_INT, NET_TCP_MTU_PROBING, "tcp_mtu_probing" },		{ CTL_INT, NET_TCP_MTU_PROBING, "tcp_mtu_probing" },
	{ CTL_INT, NET_TCP_BASE_MSS, "tcp_base_mss" },		{ CTL_INT, NET_TCP_BASE_MSS, "tcp_base_mss" },
	{ CTL_INT, NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS, "tcp_workaround_signed_windows" },		{ CTL_INT, NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS, "tcp_workaround_signed_windows" },

net/ipv4/sysctl_net_ipv4.c

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -632,13 +632,6 @@ static struct ctl_table ipv4_table[] = {
	.maxlen = TCP_CA_NAME_MAX,		.maxlen = TCP_CA_NAME_MAX,
	.proc_handler = proc_tcp_congestion_control,		.proc_handler = proc_tcp_congestion_control,
	},		},
	{
	.procname = "tcp_abc",
	.data = &sysctl_tcp_abc,
	.maxlen = sizeof(int),
	.mode = 0644,
	.proc_handler = proc_dointvec,
	},
	{		{
	.procname = "tcp_mtu_probing",		.procname = "tcp_mtu_probing",
	.data = &sysctl_tcp_mtu_probing,		.data = &sysctl_tcp_mtu_probing,