D47548.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D47548.id.diff
View Options

	diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c
	--- a/sys/netlink/netlink_domain.c
	+++ b/sys/netlink/netlink_domain.c
	@@ -145,7 +145,7 @@
	if (!nlp_unconstrained_vnet(nlp))
	return;

	- nlp->nl_groups[group_id / 64] \|= (uint64_t)1 << (group_id % 64);
	+ BIT_SET(NLP_MAX_GROUPS, group_id, &nlp->nl_groups);
	}

	static void
	@@ -154,7 +154,7 @@
	MPASS(group_id <= NLP_MAX_GROUPS);
	--group_id;

	- nlp->nl_groups[group_id / 64] &= ~((uint64_t)1 << (group_id % 64));
	+ BIT_CLR(NLP_MAX_GROUPS, group_id, &nlp->nl_groups);
	}

	static bool
	@@ -163,7 +163,7 @@
	MPASS(group_id <= NLP_MAX_GROUPS);
	--group_id;

	- return (nlp->nl_groups[group_id / 64] & ((uint64_t)1 << (group_id % 64)));
	+ return (BIT_ISSET(NLP_MAX_GROUPS, group_id, &nlp->nl_groups));
	}

	static uint32_t
	diff --git a/sys/netlink/netlink_var.h b/sys/netlink/netlink_var.h
	--- a/sys/netlink/netlink_var.h
	+++ b/sys/netlink/netlink_var.h
	@@ -53,9 +53,10 @@

	#define NLP_MAX_GROUPS 128

	+BITSET_DEFINE(nl_groups, NLP_MAX_GROUPS);
	struct nlpcb {
	struct socket *nl_socket;
	- uint64_t nl_groups[NLP_MAX_GROUPS / 64];
	+ struct nl_groups nl_groups;
	uint32_t nl_port;
	uint32_t nl_flags;
	uint32_t nl_process_id;