Module Name: src
Committed By: ozaki-r
Date: Tue Mar 14 04:24:04 UTC 2017
Modified Files:
src/sys/netinet6: icmp6.c
Log Message:
Replace DIAGNOSTIC + panic with CTASSERT
To generate a diff of this commit:
cvs rdiff -u -r1.210 -r1.211 src/sys/netinet6/icmp6.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.210 src/sys/netinet6/icmp6.c:1.211
--- src/sys/netinet6/icmp6.c:1.210 Fri Feb 17 03:57:17 2017
+++ src/sys/netinet6/icmp6.c Tue Mar 14 04:24:04 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.210 2017/02/17 03:57:17 ozaki-r Exp $ */
+/* $NetBSD: icmp6.c,v 1.211 2017/03/14 04:24:04 ozaki-r 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.210 2017/02/17 03:57:17 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.211 2017/03/14 04:24:04 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2074,10 +2074,7 @@ icmp6_reflect(struct mbuf *m, size_t off
* If there are extra headers between IPv6 and ICMPv6, strip
* off that header first.
*/
-#ifdef DIAGNOSTIC
- if (sizeof(struct ip6_hdr) + sizeof(struct icmp6_hdr) > MHLEN)
- panic("assumption failed in icmp6_reflect");
-#endif
+ CTASSERT(sizeof(struct ip6_hdr) + sizeof(struct icmp6_hdr) <= MHLEN);
if (off > sizeof(struct ip6_hdr)) {
size_t l;
struct ip6_hdr nip6;
