diff --git a/contrib/libfido2/src/netlink.c b/contrib/libfido2/src/netlink.c --- a/contrib/libfido2/src/netlink.c +++ b/contrib/libfido2/src/netlink.c @@ -750,7 +750,7 @@ if ((nl = calloc(1, sizeof(*nl))) == NULL) return (NULL); if ((nl->fd = socket(AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, - NETLINK_GENERIC)) == -1) { + NETLINK_GENERIC_NL)) == -1) { fido_log_error(errno, "%s: socket", __func__); goto fail; } diff --git a/contrib/libpcap/pcap-linux.c b/contrib/libpcap/pcap-linux.c --- a/contrib/libpcap/pcap-linux.c +++ b/contrib/libpcap/pcap-linux.c @@ -1506,7 +1506,7 @@ * * if that fails, we try an AF_INET socket. */ - fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_GENERIC); + fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_GENERIC_NL); if (fd != -1) { /* * OK, let's make sure we can do an SIOCGIFNAME diff --git a/lib/libifconfig/libifconfig_carp.c b/lib/libifconfig/libifconfig_carp.c --- a/lib/libifconfig/libifconfig_carp.c +++ b/lib/libifconfig/libifconfig_carp.c @@ -77,7 +77,7 @@ bzero(carp, sizeof(*carp) * ncarp); - if (! snl_init(&ss, NETLINK_GENERIC)) { + if (! snl_init(&ss, NETLINK_GENERIC_NL)) { ifconfig_error(h, NETLINK, ENOTSUP); return (-1); } @@ -151,7 +151,7 @@ ifconfig_error_clear(h); - if (! snl_init(&ss, NETLINK_GENERIC)) { + if (! snl_init(&ss, NETLINK_GENERIC_NL)) { ifconfig_error(h, NETLINK, ENOTSUP); return (-1); } diff --git a/sys/netlink/netlink.h b/sys/netlink/netlink.h --- a/sys/netlink/netlink.h +++ b/sys/netlink/netlink.h @@ -164,7 +164,10 @@ #define NETLINK_IP6_FW 13 /* not supported */ #define NETLINK_DNRTMSG 14 /* not supported */ #define NETLINK_KOBJECT_UEVENT 15 /* not supported */ -#define NETLINK_GENERIC 16 /* Generic netlink (dynamic families) */ +#define NETLINK_GENERIC_NL 16 /* Generic netlink (dynamic families), + NETLINK_GENERIC is used by snmp + defined in if_mib.h, so change + the netlink type name */ /* * RFC 3549, 2.3.2.2 The ACK Netlink Message diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c --- a/sys/netlink/netlink_generic.c +++ b/sys/netlink/netlink_generic.c @@ -257,11 +257,11 @@ static void nlctrl_notify(void *arg __unused, const struct genl_family *gf, int cmd) { - struct nlmsghdr hdr = {.nlmsg_type = NETLINK_GENERIC }; + struct nlmsghdr hdr = {.nlmsg_type = NETLINK_GENERIC_NL }; struct genlmsghdr ghdr = { .cmd = cmd }; struct nl_writer nw = {}; - if (nlmsg_get_group_writer(&nw, NLMSG_SMALL, NETLINK_GENERIC, ctrl_group_id)) { + if (nlmsg_get_group_writer(&nw, NLMSG_SMALL, NETLINK_GENERIC_NL, ctrl_group_id)) { dump_family(&hdr, &ghdr, gf, &nw); nlmsg_flush(&nw); return; @@ -289,7 +289,7 @@ ctrl_group_id = genl_register_group(CTRL_FAMILY_NAME, "notify"); family_event_tag = EVENTHANDLER_REGISTER(genl_family_event, nlctrl_notify, NULL, EVENTHANDLER_PRI_ANY); - netlink_register_proto(NETLINK_GENERIC, "NETLINK_GENERIC", genl_handle_message); + netlink_register_proto(NETLINK_GENERIC_NL, "NETLINK_GENERIC", genl_handle_message); } SYSINIT(genl_load_all, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, genl_load_all, NULL); diff --git a/tests/sys/netlink/test_snl_generic.c b/tests/sys/netlink/test_snl_generic.c --- a/tests/sys/netlink/test_snl_generic.c +++ b/tests/sys/netlink/test_snl_generic.c @@ -42,7 +42,7 @@ require_netlink(); - if (!snl_init(&ss, NETLINK_GENERIC)) + if (!snl_init(&ss, NETLINK_GENERIC_NL)) atf_tc_fail("snl_init() failed"); ATF_CHECK_EQ(snl_get_genl_family(&ss, "nlctrl"), GENL_ID_CTRL); @@ -60,7 +60,7 @@ require_netlink(); - if (!snl_init(&ss, NETLINK_GENERIC)) + if (!snl_init(&ss, NETLINK_GENERIC_NL)) atf_tc_fail("snl_init() failed"); ATF_CHECK_EQ(snl_get_genl_family(&ss, "no-such-family"), 0); @@ -80,7 +80,7 @@ require_netlink(); - if (!snl_init(&ss, NETLINK_GENERIC)) + if (!snl_init(&ss, NETLINK_GENERIC_NL)) atf_tc_fail("snl_init() failed"); snl_init_writer(&ss, &nw); diff --git a/usr.bin/genl/genl.c b/usr.bin/genl/genl.c --- a/usr.bin/genl/genl.c +++ b/usr.bin/genl/genl.c @@ -157,7 +157,7 @@ if (modfind("netlink") == -1) err(EXIT_FAILURE, "require netlink module to be loaded"); - if (!snl_init(&ss, NETLINK_GENERIC)) + if (!snl_init(&ss, NETLINK_GENERIC_NL)) err(EXIT_FAILURE, "snl_init()"); snl_init_writer(&ss, &nw); 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_NL, IFMIB_SYSTEM, IFMIB_IFCOUNT }; @@ -469,7 +469,7 @@ size_t datalen = 0; static int name[] = { CTL_NET, PF_LINK, - NETLINK_GENERIC, + NETLINK_GENERIC_NL, IFMIB_IFDATA, 0, IFDATA_GENERAL };