Date: Thu, 9 Feb 2012 22:02:00 +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-9@freebsd.org Subject: svn commit: r231309 - stable/9/sys/netinet6 Message-ID: <201202092202.q19M20Mo037396@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202092202.q19M20Mo037396>