svn commit: r231308 - stable/7/sys/netinet6
Bjoern A. Zeeb
bz at FreeBSD.org
Thu Feb 9 21:33:45 UTC 2012
Author: bz
Date: Thu Feb 9 21:33:44 2012
New Revision: 231308
URL: http://svn.freebsd.org/changeset/base/231308
Log:
MFC r229546:
Convert an #ifdef DIAGNOSTIC if/panic to a KASSERT.
Modified:
stable/7/sys/netinet6/in6_ifattach.c
Directory Properties:
stable/7/sys/ (props changed)
Modified: stable/7/sys/netinet6/in6_ifattach.c
==============================================================================
--- stable/7/sys/netinet6/in6_ifattach.c Thu Feb 9 21:33:36 2012 (r231307)
+++ stable/7/sys/netinet6/in6_ifattach.c Thu Feb 9 21:33:44 2012 (r231308)
@@ -480,12 +480,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
+ KASSERT(ia != NULL, ("%s: ia == NULL, ifp=%p", __func__, ifp));
/*
* Make the link-local prefix (fe80::%link/64) as on-link.
More information about the svn-src-stable
mailing list