svn commit: r231309 - stable/9/sys/netinet6

Bjoern A. Zeeb bz at FreeBSD.org
Thu Feb 9 22:02:00 UTC 2012


Author: bz
Date: Thu Feb  9 22:01:59 2012
New Revision: 231309
URL: http://svn.freebsd.org/changeset/base/231309

Log:
  MFC r229546:
  
   Convert an #ifdef DIAGNOSTIC if/panic to a KASSERT.

Modified:
  stable/9/sys/netinet6/in6_ifattach.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet6/in6_ifattach.c
==============================================================================
--- stable/9/sys/netinet6/in6_ifattach.c	Thu Feb  9 21:33:44 2012	(r231308)
+++ stable/9/sys/netinet6/in6_ifattach.c	Thu Feb  9 22:01:59 2012	(r231309)
@@ -513,12 +513,8 @@ 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));
+
 	ifa_free(&ia->ia_ifa);
 
 	/*


More information about the svn-src-stable-9 mailing list