Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 21 Apr 2009 09:43:51 +0000 (UTC)
From:      Bruce M Simpson <bms@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r191348 - head/sys/netinet
Message-ID:  <200904210943.n3L9hp4n078251@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bms
Date: Tue Apr 21 09:43:51 2009
New Revision: 191348
URL: http://svn.freebsd.org/changeset/base/191348

Log:
  remove IFF_ASSERTGIANT

Modified:
  head/sys/netinet/in_mcast.c

Modified: head/sys/netinet/in_mcast.c
==============================================================================
--- head/sys/netinet/in_mcast.c	Tue Apr 21 07:22:12 2009	(r191347)
+++ head/sys/netinet/in_mcast.c	Tue Apr 21 09:43:51 2009	(r191348)
@@ -399,9 +399,6 @@ in_getmulti(struct ifnet *ifp, const str
 	struct in_multi		*inm;
 	int error;
 
-#if defined(INVARIANTS) && defined(IFF_ASSERTGIANT)
-	IFF_ASSERTGIANT(ifp);
-#endif
 	IN_MULTI_LOCK_ASSERT();
 
 	ii = (struct in_ifinfo *)ifp->if_afdata[AF_INET];
@@ -511,11 +508,6 @@ inm_release_locked(struct in_multi *inm)
 {
 	struct ifmultiaddr *ifma;
 
-#if defined(INVARIANTS) && defined(IFF_ASSERTGIANT)
-	if (!inm_is_ifp_detached(inm))
-		IFF_ASSERTGIANT(ifp);
-#endif
-
 	IN_MULTI_LOCK_ASSERT();
 
 	CTR2(KTR_IGMPV3, "%s: refcount is %d", __func__, inm->inm_refcount);
@@ -1220,11 +1212,6 @@ in_leavegroup_locked(struct in_multi *in
 
 	error = 0;
 
-#if defined(INVARIANTS) && defined(IFF_ASSERTGIANT)
-	if (!inm_is_ifp_detached(inm))
-		IFF_ASSERTGIANT(inm->inm_ifp);
-#endif
-
 	IN_MULTI_LOCK_ASSERT();
 
 	CTR5(KTR_IGMPV3, "%s: leave inm %p, %s/%s, imf %p", __func__,



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