diff --git a/contrib/bsnmp/snmp_mibII/mibII.c b/contrib/bsnmp/snmp_mibII/mibII.c --- a/contrib/bsnmp/snmp_mibII/mibII.c +++ b/contrib/bsnmp/snmp_mibII/mibII.c @@ -313,7 +313,7 @@ name[0] = CTL_NET; name[1] = PF_LINK; - name[2] = NETLINK_GENERIC; + name[2] = NETLINK_GENERIC_MIB; name[3] = IFMIB_IFDATA; name[4] = ifp->sysindex; name[5] = IFDATA_GENERAL; @@ -480,7 +480,7 @@ */ name[0] = CTL_NET; name[1] = PF_LINK; - name[2] = NETLINK_GENERIC; + name[2] = NETLINK_GENERIC_MIB; name[3] = IFMIB_IFDATA; name[4] = ifp->sysindex; name[5] = IFDATA_LINKSPECIFIC; @@ -947,7 +947,7 @@ } name[0] = CTL_NET; name[1] = PF_LINK; - name[2] = NETLINK_GENERIC; + name[2] = NETLINK_GENERIC_MIB; name[3] = IFMIB_IFDATA; name[5] = IFDATA_GENERAL; for (idx = 1; idx <= count; idx++) { diff --git a/lib/libifconfig/libifconfig.c b/lib/libifconfig/libifconfig.c --- a/lib/libifconfig/libifconfig.c +++ b/lib/libifconfig/libifconfig.c @@ -307,7 +307,7 @@ name[0] = CTL_NET; name[1] = PF_LINK; - name[2] = NETLINK_GENERIC; + name[2] = NETLINK_GENERIC_MIB; name[3] = IFMIB_IFDATA; name[4] = ifindex; name[5] = IFDATA_DRIVERNAME; diff --git a/libexec/rpc.rstatd/rstat_proc.c b/libexec/rpc.rstatd/rstat_proc.c --- a/libexec/rpc.rstatd/rstat_proc.c +++ b/libexec/rpc.rstatd/rstat_proc.c @@ -253,7 +253,7 @@ mib[0] = CTL_NET; mib[1] = PF_LINK; - mib[2] = NETLINK_GENERIC; + mib[2] = NETLINK_GENERIC_MIB; mib[3] = IFMIB_SYSTEM; mib[4] = IFMIB_IFCOUNT; len = sizeof ifcount; diff --git a/sys/net/if_mib.h b/sys/net/if_mib.h --- a/sys/net/if_mib.h +++ b/sys/net/if_mib.h @@ -63,7 +63,7 @@ * MIB tags as the net.link level * All of the other values are IFT_* names defined in if_types.h. */ -#define NETLINK_GENERIC 0 /* functions not specific to a type of iface */ +#define NETLINK_GENERIC_MIB 0 /* functions not specific to a type of iface */ /* * The reason why the IFDATA_LINKSPECIFIC stuff is not under the diff --git a/tools/tools/ifinfo/ifinfo.c b/tools/tools/ifinfo/ifinfo.c --- a/tools/tools/ifinfo/ifinfo.c +++ b/tools/tools/ifinfo/ifinfo.c @@ -85,7 +85,7 @@ name[0] = CTL_NET; name[1] = PF_LINK; - name[2] = NETLINK_GENERIC; + name[2] = NETLINK_GENERIC_MIB; name[3] = IFMIB_SYSTEM; name[4] = IFMIB_IFCOUNT; diff --git a/usr.bin/systat/ifstat.c b/usr.bin/systat/ifstat.c --- a/usr.bin/systat/ifstat.c +++ b/usr.bin/systat/ifstat.c @@ -451,7 +451,7 @@ size_t datalen = 0; static int name[] = { CTL_NET, PF_LINK, - NETLINK_GENERIC, + NETLINK_GENERIC_MIB, IFMIB_SYSTEM, IFMIB_IFCOUNT }; @@ -469,7 +469,7 @@ size_t datalen = 0; static int name[] = { CTL_NET, PF_LINK, - NETLINK_GENERIC, + NETLINK_GENERIC_MIB, IFMIB_IFDATA, 0, IFDATA_GENERAL }; diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c --- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c +++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c @@ -134,7 +134,7 @@ name[0] = CTL_NET; name[1] = PF_LINK; - name[2] = NETLINK_GENERIC; + name[2] = NETLINK_GENERIC_MIB; name[3] = IFMIB_IFDATA; name[5] = IFDATA_DRIVERNAME;