Module Name: src
Committed By: maxv
Date: Sat Jul 29 05:08:48 UTC 2017
Modified Files:
src/sys/netinet: tcp_subr.c
Log Message:
Forgot to commit this file yesterday.
To generate a diff of this commit:
cvs rdiff -u -r1.270 -r1.271 src/sys/netinet/tcp_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/tcp_subr.c
diff -u src/sys/netinet/tcp_subr.c:1.270 src/sys/netinet/tcp_subr.c:1.271
--- src/sys/netinet/tcp_subr.c:1.270 Fri Mar 3 07:13:06 2017
+++ src/sys/netinet/tcp_subr.c Sat Jul 29 05:08:48 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_subr.c,v 1.270 2017/03/03 07:13:06 ozaki-r Exp $ */
+/* $NetBSD: tcp_subr.c,v 1.271 2017/07/29 05:08:48 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,12 +91,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.270 2017/03/03 07:13:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.271 2017/07/29 05:08:48 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_ipsec.h"
-#include "opt_tcp_compat_42.h"
#include "opt_inet_csum.h"
#include "opt_mbuftrace.h"
#endif
@@ -201,11 +200,6 @@ int tcp_init_win_max[] = {
int tcp_init_win = TCP_INIT_WIN;
int tcp_init_win_local = TCP_INIT_WIN_LOCAL;
int tcp_mss_ifmtu = 0;
-#ifdef TCP_COMPAT_42
-int tcp_compat_42 = 1;
-#else
-int tcp_compat_42 = 0;
-#endif
int tcp_rst_ppslim = 100; /* 100pps */
int tcp_ackdrop_ppslim = 100; /* 100pps */
int tcp_do_loopback_cksum = 0;
@@ -702,10 +696,7 @@ tcp_respond(struct tcpcb *tp, struct mbu
if (m == NULL)
return (ENOBUFS);
- if (tcp_compat_42)
- tlen = 1;
- else
- tlen = 0;
+ tlen = 0;
m->m_data += max_linkhdr;
bcopy(mtod(mtemplate, void *), mtod(m, void *),
@@ -2347,16 +2338,6 @@ tcp_new_iss1(void *laddr, void *faddr, u
}
}
- if (tcp_compat_42) {
- /*
- * Limit it to the positive range for really old TCP
- * implementations.
- * Just AND off the top bit instead of checking if
- * is set first - saves a branch 50% of the time.
- */
- tcp_iss &= 0x7fffffff; /* XXX */
- }
-
return (tcp_iss);
}
