svn commit: r239935 - stable/9/usr.sbin/ifmcstat

[Maxim Konovalov]

Author: maxim
Date: Fri Aug 31 06:34:46 2012
New Revision: 239935
URL: http://svn.freebsd.org/changeset/base/239935

Log:
  MFC r230617: allow to build ifmcstat(8) without kvm(3) support.

Modified:
  stable/9/usr.sbin/ifmcstat/ifmcstat.c
Directory Properties:
  stable/9/usr.sbin/ifmcstat/   (props changed)

Modified: stable/9/usr.sbin/ifmcstat/ifmcstat.c
==============================================================================
--- stable/9/usr.sbin/ifmcstat/ifmcstat.c	Fri Aug 31 02:59:44 2012	(r239934)
+++ stable/9/usr.sbin/ifmcstat/ifmcstat.c	Fri Aug 31 06:34:46 2012	(r239935)
@@ -440,32 +440,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;
@@ -762,6 +736,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)
 {