[src/trunk]: src/sys/netinet6 Remove redundant condition (harmless). PR/53030.

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a67eb2420c5c
branches:  trunk
changeset: 830136:a67eb2420c5c
user:      maxv <maxv%NetBSD.org@localhost>
date:      Mon Feb 26 09:13:00 2018 +0000

description:
Remove redundant condition (harmless). PR/53030.

diffstat:

 sys/netinet6/icmp6.c   |  7 +++----
 sys/netinet6/raw_ip6.c |  7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diffs (56 lines):

diff -r 10b4e0add633 -r a67eb2420c5c sys/netinet6/icmp6.c
--- a/sys/netinet6/icmp6.c      Mon Feb 26 09:04:29 2018 +0000
+++ b/sys/netinet6/icmp6.c      Mon Feb 26 09:13:00 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: icmp6.c,v 1.221 2018/02/26 09:04:29 maxv Exp $ */
+/*     $NetBSD: icmp6.c,v 1.222 2018/02/26 09:13:00 maxv Exp $ */
 /*     $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.221 2018/02/26 09:04:29 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.222 2018/02/26 09:13:00 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -2007,8 +2007,7 @@
                        /*
                         * Check AH/ESP integrity
                         */
-                       if (!ipsec_used ||
-                           (ipsec_used && !ipsec_in_reject(m, last)))
+                       if (!ipsec_used || !ipsec_in_reject(m, last))
 #endif
                        if ((n = m_copy(m, 0, (int)M_COPYALL)) != NULL) {
                                if (last->in6p_flags & IN6P_CONTROLOPTS)
diff -r 10b4e0add633 -r a67eb2420c5c sys/netinet6/raw_ip6.c
--- a/sys/netinet6/raw_ip6.c    Mon Feb 26 09:04:29 2018 +0000
+++ b/sys/netinet6/raw_ip6.c    Mon Feb 26 09:13:00 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: raw_ip6.c,v 1.163 2018/02/26 09:04:29 maxv Exp $       */
+/*     $NetBSD: raw_ip6.c,v 1.164 2018/02/26 09:13:00 maxv Exp $       */
 /*     $KAME: raw_ip6.c,v 1.82 2001/07/23 18:57:56 jinmei Exp $        */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.163 2018/02/26 09:04:29 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.164 2018/02/26 09:13:00 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ipsec.h"
@@ -197,8 +197,7 @@
                        /*
                         * Check AH/ESP integrity
                         */
-                       if (!ipsec_used ||
-                           (ipsec_used && !ipsec_in_reject(m, last)))
+                       if (!ipsec_used || !ipsec_in_reject(m, last))
 #endif
                        if ((n = m_copy(m, 0, (int)M_COPYALL)) != NULL) {
                                if (last->in6p_flags & IN6P_CONTROLOPTS)