Module Name: src
Committed By: ozaki-r
Date: Thu May 19 03:11:42 UTC 2016
Modified Files:
src/sys/netinet6: scope6.c
Log Message:
Replace DIAGNOSTIC & panic with KASSERT
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/netinet6/scope6.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/scope6.c
diff -u src/sys/netinet6/scope6.c:1.12 src/sys/netinet6/scope6.c:1.13
--- src/sys/netinet6/scope6.c:1.12 Tue Apr 26 08:44:45 2016
+++ src/sys/netinet6/scope6.c Thu May 19 03:11:42 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: scope6.c,v 1.12 2016/04/26 08:44:45 ozaki-r Exp $ */
+/* $NetBSD: scope6.c,v 1.13 2016/05/19 03:11:42 ozaki-r Exp $ */
/* $KAME$ */
/*-
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1.12 2016/04/26 08:44:45 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1.13 2016/05/19 03:11:42 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -380,12 +380,7 @@ in6_setscope(struct in6_addr *in6, const
uint32_t zoneid = 0;
const struct scope6_id *sid = SID(ifp);
-#ifdef DIAGNOSTIC
- if (sid == NULL) { /* should not happen */
- panic("in6_setscope: scope array is NULL");
- /* NOTREACHED */
- }
-#endif
+ KASSERT(sid != NULL);
/*
* special case: the loopback address can only belong to a loopback
