svn commit: r273200 - in user/cperciva/freebsd-update-build/patches: 10.0-RELEASE 8.4-RELEASE 9.1-RELEASE 9.2-RELEASE 9.3-RELEASE

[Xin LI]

Author: delphij
Date: Fri Oct 17 00:05:31 2014
New Revision: 273200
URL: https://svnweb.freebsd.org/changeset/base/273200

Log:
  Commit patches from 2014-09-16 batch.

Added:
  user/cperciva/freebsd-update-build/patches/10.0-RELEASE/9-SA-14:19.tcp
  user/cperciva/freebsd-update-build/patches/8.4-RELEASE/16-SA-14:19.tcp
  user/cperciva/freebsd-update-build/patches/9.1-RELEASE/19-SA-14:19.tcp
  user/cperciva/freebsd-update-build/patches/9.2-RELEASE/12-SA-14:19.tcp
  user/cperciva/freebsd-update-build/patches/9.3-RELEASE/2-SA-14:19.tcp

Added: user/cperciva/freebsd-update-build/patches/10.0-RELEASE/9-SA-14:19.tcp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/cperciva/freebsd-update-build/patches/10.0-RELEASE/9-SA-14:19.tcp	Fri Oct 17 00:05:31 2014	(r273200)
@@ -0,0 +1,17 @@
+Index: sys/netinet/tcp_input.c
+===================================================================
+--- sys/netinet/tcp_input.c	(revision 271383)
++++ sys/netinet/tcp_input.c	(working copy)
+@@ -2092,11 +2092,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th,
+ 
+ 	todrop = tp->rcv_nxt - th->th_seq;
+ 	if (todrop > 0) {
+-		/*
+-		 * If this is a duplicate SYN for our current connection,
+-		 * advance over it and pretend and it's not a SYN.
+-		 */
+-		if (thflags & TH_SYN && th->th_seq == tp->irs) {
++		if (thflags & TH_SYN) {
+ 			thflags &= ~TH_SYN;
+ 			th->th_seq++;
+ 			if (th->th_urp > 1)

Added: user/cperciva/freebsd-update-build/patches/8.4-RELEASE/16-SA-14:19.tcp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/cperciva/freebsd-update-build/patches/8.4-RELEASE/16-SA-14:19.tcp	Fri Oct 17 00:05:31 2014	(r273200)
@@ -0,0 +1,17 @@
+Index: sys/netinet/tcp_input.c
+===================================================================
+--- sys/netinet/tcp_input.c	(revision 271383)
++++ sys/netinet/tcp_input.c	(working copy)
+@@ -2092,11 +2092,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th,
+ 
+ 	todrop = tp->rcv_nxt - th->th_seq;
+ 	if (todrop > 0) {
+-		/*
+-		 * If this is a duplicate SYN for our current connection,
+-		 * advance over it and pretend and it's not a SYN.
+-		 */
+-		if (thflags & TH_SYN && th->th_seq == tp->irs) {
++		if (thflags & TH_SYN) {
+ 			thflags &= ~TH_SYN;
+ 			th->th_seq++;
+ 			if (th->th_urp > 1)

Added: user/cperciva/freebsd-update-build/patches/9.1-RELEASE/19-SA-14:19.tcp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/cperciva/freebsd-update-build/patches/9.1-RELEASE/19-SA-14:19.tcp	Fri Oct 17 00:05:31 2014	(r273200)
@@ -0,0 +1,17 @@
+Index: sys/netinet/tcp_input.c
+===================================================================
+--- sys/netinet/tcp_input.c	(revision 271383)
++++ sys/netinet/tcp_input.c	(working copy)
+@@ -2092,11 +2092,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th,
+ 
+ 	todrop = tp->rcv_nxt - th->th_seq;
+ 	if (todrop > 0) {
+-		/*
+-		 * If this is a duplicate SYN for our current connection,
+-		 * advance over it and pretend and it's not a SYN.
+-		 */
+-		if (thflags & TH_SYN && th->th_seq == tp->irs) {
++		if (thflags & TH_SYN) {
+ 			thflags &= ~TH_SYN;
+ 			th->th_seq++;
+ 			if (th->th_urp > 1)

Added: user/cperciva/freebsd-update-build/patches/9.2-RELEASE/12-SA-14:19.tcp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/cperciva/freebsd-update-build/patches/9.2-RELEASE/12-SA-14:19.tcp	Fri Oct 17 00:05:31 2014	(r273200)
@@ -0,0 +1,17 @@
+Index: sys/netinet/tcp_input.c
+===================================================================
+--- sys/netinet/tcp_input.c	(revision 271383)
++++ sys/netinet/tcp_input.c	(working copy)
+@@ -2092,11 +2092,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th,
+ 
+ 	todrop = tp->rcv_nxt - th->th_seq;
+ 	if (todrop > 0) {
+-		/*
+-		 * If this is a duplicate SYN for our current connection,
+-		 * advance over it and pretend and it's not a SYN.
+-		 */
+-		if (thflags & TH_SYN && th->th_seq == tp->irs) {
++		if (thflags & TH_SYN) {
+ 			thflags &= ~TH_SYN;
+ 			th->th_seq++;
+ 			if (th->th_urp > 1)

Added: user/cperciva/freebsd-update-build/patches/9.3-RELEASE/2-SA-14:19.tcp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/cperciva/freebsd-update-build/patches/9.3-RELEASE/2-SA-14:19.tcp	Fri Oct 17 00:05:31 2014	(r273200)
@@ -0,0 +1,17 @@
+Index: sys/netinet/tcp_input.c
+===================================================================
+--- sys/netinet/tcp_input.c	(revision 271383)
++++ sys/netinet/tcp_input.c	(working copy)
+@@ -2092,11 +2092,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th,
+ 
+ 	todrop = tp->rcv_nxt - th->th_seq;
+ 	if (todrop > 0) {
+-		/*
+-		 * If this is a duplicate SYN for our current connection,
+-		 * advance over it and pretend and it's not a SYN.
+-		 */
+-		if (thflags & TH_SYN && th->th_seq == tp->irs) {
++		if (thflags & TH_SYN) {
+ 			thflags &= ~TH_SYN;
+ 			th->th_seq++;
+ 			if (th->th_urp > 1)