d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

o in6_ifinfo() does not do any kvm(3) operations, so

Browse Source 
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
This commit is contained in:
Maxim Konovalov 2012-01-27 17:16:44 +00:00
parent 7dec311e83
commit 10fa36f0bc
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=230617
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
usr.sbin/ifmcstat/ifmcstat.c
View File

@ -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)
{
@ -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)
{