Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Feb 2012 21:33:36 +0000 (UTC)
From:      "Bjoern A. Zeeb" <bz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r231307 - stable/8/sys/netinet6
Message-ID:  <201202092133.q19LXarg033933@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bz
Date: Thu Feb  9 21:33:36 2012
New Revision: 231307
URL: http://svn.freebsd.org/changeset/base/231307

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

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

Modified: stable/8/sys/netinet6/in6_ifattach.c
==============================================================================
--- stable/8/sys/netinet6/in6_ifattach.c	Thu Feb  9 21:06:47 2012	(r231306)
+++ stable/8/sys/netinet6/in6_ifattach.c	Thu Feb  9 21:33:36 2012	(r231307)
@@ -512,12 +512,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);
 
 	/*



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202092133.q19LXarg033933>