CVS commit: src/sys/netinet

[Robert Elz]

Module Name:    src
Committed By:   kre
Date:           Wed Jan  4 12:35:14 UTC 2017

Modified Files:
        src/sys/netinet: tcp_input.c tcp_output.c

Log Message:
Remove redundant tests:  if optlen === 0, then optlen % 4 != 2 (it is 0)
so there is no need to test both.


To generate a diff of this commit:
cvs rdiff -u -r1.352 -r1.353 src/sys/netinet/tcp_input.c
cvs rdiff -u -r1.192 -r1.193 src/sys/netinet/tcp_output.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_input.c
diff -u src/sys/netinet/tcp_input.c:1.352 src/sys/netinet/tcp_input.c:1.353
--- src/sys/netinet/tcp_input.c:1.352	Mon Jan  2 01:18:42 2017
+++ src/sys/netinet/tcp_input.c	Wed Jan  4 12:35:14 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: tcp_input.c,v 1.352 2017/01/02 01:18:42 christos Exp $	*/
+/*	$NetBSD: tcp_input.c,v 1.353 2017/01/04 12:35:14 kre Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.352 2017/01/02 01:18:42 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.353 2017/01/04 12:35:14 kre Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -4656,7 +4656,7 @@ syn_cache_respond(struct syn_cache *sc, 
 	}
 
 	if (sc->sc_flags & SCF_TIMESTAMP) {
-                while (!optlen || optlen % 4 != 2) {
+                while (optlen % 4 != 2) {
                         optlen += TCPOLEN_NOP;
                         *optp++ = TCPOPT_NOP;
                 }

Index: src/sys/netinet/tcp_output.c
diff -u src/sys/netinet/tcp_output.c:1.192 src/sys/netinet/tcp_output.c:1.193
--- src/sys/netinet/tcp_output.c:1.192	Tue Jan  3 20:59:32 2017
+++ src/sys/netinet/tcp_output.c	Wed Jan  4 12:35:14 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: tcp_output.c,v 1.192 2017/01/03 20:59:32 christos Exp $	*/
+/*	$NetBSD: tcp_output.c,v 1.193 2017/01/04 12:35:14 kre Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -135,7 +135,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.192 2017/01/03 20:59:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.193 2017/01/04 12:35:14 kre Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1194,7 +1194,7 @@ send:
 	    ((flags & (TH_SYN|TH_ACK)) == TH_SYN ||
 	     (tp->t_flags & TF_RCVD_TSTMP))) {
 		int alen = 0;
-		while (!optlen || optlen % 4 != 2) {
+		while (optlen % 4 != 2) {
 			optlen += TCPOLEN_NOP;
 			*optp++ = TCPOPT_NOP;
 			alen++;
@@ -1242,7 +1242,7 @@ send:
 	if (sack_numblks) {
 		int alen = 0;
 		int sack_len = sack_numblks * 8;
-		while (!optlen || optlen % 4 != 2) {
+		while (optlen % 4 != 2) {
 			optlen += TCPOLEN_NOP;
 			*optp++ = TCPOPT_NOP;
 			alen++;