Module Name: src
Committed By: maxv
Date: Mon Feb 26 09:13:00 UTC 2018
Modified Files:
src/sys/netinet6: icmp6.c raw_ip6.c
Log Message:
Remove redundant condition (harmless). PR/53030.
To generate a diff of this commit:
cvs rdiff -u -r1.221 -r1.222 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.163 -r1.164 src/sys/netinet6/raw_ip6.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/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.221 src/sys/netinet6/icmp6.c:1.222
--- src/sys/netinet6/icmp6.c:1.221 Mon Feb 26 09:04:29 2018
+++ src/sys/netinet6/icmp6.c Mon Feb 26 09:13:00 2018
@@ -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 @@ icmp6_rip6_input(struct mbuf **mp, int o
/*
* 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)
Index: src/sys/netinet6/raw_ip6.c
diff -u src/sys/netinet6/raw_ip6.c:1.163 src/sys/netinet6/raw_ip6.c:1.164
--- src/sys/netinet6/raw_ip6.c:1.163 Mon Feb 26 09:04:29 2018
+++ src/sys/netinet6/raw_ip6.c Mon Feb 26 09:13:00 2018
@@ -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 @@ rip6_input(struct mbuf **mp, int *offp,
/*
* 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)
