Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 27 Jan 2012 17:16:45 +0000 (UTC)
From:      Maxim Konovalov <maxim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r230617 - head/usr.sbin/ifmcstat
Message-ID:  <201201271716.q0RHGjFt048700@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: maxim
Date: Fri Jan 27 17:16:44 2012
New Revision: 230617
URL: http://svn.freebsd.org/changeset/base/230617

Log:
  o in6_ifinfo() does not do any kvm(3) operations, so
  do not guard it by WITH_KVM ifdef.  This allows to build
  ifmcstat(8) without kvm(3) support.
  
  PR:		bin/164353
  Submitted by:	Ivan Rozhuk
  MFC after:	2 weeks

Modified:
  head/usr.sbin/ifmcstat/ifmcstat.c

Modified: head/usr.sbin/ifmcstat/ifmcstat.c
==============================================================================
--- head/usr.sbin/ifmcstat/ifmcstat.c	Fri Jan 27 14:50:15 2012	(r230616)
+++ head/usr.sbin/ifmcstat/ifmcstat.c	Fri Jan 27 17:16:44 2012	(r230617)
@@ -441,32 +441,6 @@ ll_addrlist(struct ifaddr *ifap)
 #ifdef INET6
 
 static void
-in6_ifinfo(struct mld_ifinfo *mli)
-{
-
-	printf("\t");
-	switch (mli->mli_version) {
-	case MLD_VERSION_1:
-	case MLD_VERSION_2:
-		printf("mldv%d", mli->mli_version);
-		break;
-	default:
-		printf("mldv?(%d)", mli->mli_version);
-		break;
-	}
-	printb(" flags", mli->mli_flags, "\020\1SILENT");
-	if (mli->mli_version == MLD_VERSION_2) {
-		printf(" rv %u qi %u qri %u uri %u",
-		    mli->mli_rv, mli->mli_qi, mli->mli_qri, mli->mli_uri);
-	}
-	if (vflag >= 2) {
-		printf(" v1timer %u v2timer %u", mli->mli_v1_timer,
-		   mli->mli_v2_timer);
-	}
-	printf("\n");
-}
-
-static void
 if6_addrlist(struct ifaddr *ifap)
 {
 	struct ifnet ifnet;
@@ -763,6 +737,33 @@ in_multientry(struct in_multi *pinm)
 #endif /* WITH_KVM */
 
 #ifdef INET6
+
+static void
+in6_ifinfo(struct mld_ifinfo *mli)
+{
+
+	printf("\t");
+	switch (mli->mli_version) {
+	case MLD_VERSION_1:
+	case MLD_VERSION_2:
+		printf("mldv%d", mli->mli_version);
+		break;
+	default:
+		printf("mldv?(%d)", mli->mli_version);
+		break;
+	}
+	printb(" flags", mli->mli_flags, "\020\1SILENT");
+	if (mli->mli_version == MLD_VERSION_2) {
+		printf(" rv %u qi %u qri %u uri %u",
+		    mli->mli_rv, mli->mli_qi, mli->mli_qri, mli->mli_uri);
+	}
+	if (vflag >= 2) {
+		printf(" v1timer %u v2timer %u", mli->mli_v1_timer,
+		   mli->mli_v2_timer);
+	}
+	printf("\n");
+}
+
 static const char *
 inet6_n2a(struct in6_addr *p)
 {

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