Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 10 Jan 2019 00:52:06 +0000 (UTC)
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r342907 - head/sys/netinet6
Message-ID:  <201901100052.x0A0q6FU008989@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: glebius
Date: Thu Jan 10 00:52:06 2019
New Revision: 342907
URL: https://svnweb.freebsd.org/changeset/base/342907

Log:
  Remove unnecessary ifdef. With INVARIANTS all KASSERTs are empty statements,
  so won't be compiled in.

Modified:
  head/sys/netinet6/in6_mcast.c

Modified: head/sys/netinet6/in6_mcast.c
==============================================================================
--- head/sys/netinet6/in6_mcast.c	Thu Jan 10 00:37:14 2019	(r342906)
+++ head/sys/netinet6/in6_mcast.c	Thu Jan 10 00:52:06 2019	(r342907)
@@ -1262,7 +1262,6 @@ in6_joingroup_locked(struct ifnet *ifp, const struct i
 	char			 ip6tbuf[INET6_ADDRSTRLEN];
 #endif
 
-#ifdef INVARIANTS
 	/*
 	 * Sanity: Check scope zone ID was set for ifp, if and
 	 * only if group is scoped to an interface.
@@ -1274,7 +1273,6 @@ in6_joingroup_locked(struct ifnet *ifp, const struct i
 		KASSERT(mcaddr->s6_addr16[1] != 0,
 		    ("%s: scope zone ID not set", __func__));
 	}
-#endif
 
 	IN6_MULTI_LOCK_ASSERT();
 	IN6_MULTI_LIST_UNLOCK_ASSERT();



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