Module Name: src
Committed By: mrg
Date: Fri Oct 18 02:20:15 UTC 2013
Modified Files:
src/sys/netinet6: in6_ifattach.c
Log Message:
convert a DIAGNOSTIC / panic into a KASSERTMSG().
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/netinet6/in6_ifattach.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/in6_ifattach.c
diff -u src/sys/netinet6/in6_ifattach.c:1.87 src/sys/netinet6/in6_ifattach.c:1.88
--- src/sys/netinet6/in6_ifattach.c:1.87 Sat Dec 31 20:41:59 2011
+++ src/sys/netinet6/in6_ifattach.c Fri Oct 18 02:20:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_ifattach.c,v 1.87 2011/12/31 20:41:59 christos Exp $ */
+/* $NetBSD: in6_ifattach.c,v 1.88 2013/10/18 02:20:15 mrg Exp $ */
/* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.87 2011/12/31 20:41:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.88 2013/10/18 02:20:15 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -588,12 +588,7 @@ in6_ifattach_linklocal(struct ifnet *ifp
}
ia = in6ifa_ifpforlinklocal(ifp, 0); /* ia must not be NULL */
-#ifdef DIAGNOSTIC
- if (!ia) {
- panic("ia == NULL in in6_ifattach_linklocal");
- /* NOTREACHED */
- }
-#endif
+ KASSERTMSG(ia, "ia == NULL in in6_ifattach_linklocal");
/*
* Make the link-local prefix (fe80::/64%link) as on-link.
