D47553.id146384.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D47553.id146384.diff
View Options

	diff --git a/sys/netlink/netlink_ctl.h b/sys/netlink/netlink_ctl.h
	--- a/sys/netlink/netlink_ctl.h
	+++ b/sys/netlink/netlink_ctl.h
	@@ -95,7 +95,7 @@
	};

	uint32_t genl_register_family(const char *family_name, size_t hdrsize,
	- int family_version, int max_attr_idx);
	+ uint16_t family_version, uint16_t max_attr_idx);
	bool genl_unregister_family(const char *family_name);
	bool genl_register_cmds(const char family_name, const struct genl_cmd cmds,
	int count);
	diff --git a/sys/netlink/netlink_generic_kpi.c b/sys/netlink/netlink_generic_kpi.c
	--- a/sys/netlink/netlink_generic_kpi.c
	+++ b/sys/netlink/netlink_generic_kpi.c
	@@ -93,10 +93,9 @@
	}

	uint32_t
	-genl_register_family(const char *family_name, size_t hdrsize, int family_version,
	- int max_attr_idx)
	+genl_register_family(const char *family_name, size_t hdrsize,
	+ uint16_t family_version, uint16_t max_attr_idx)
	{
	- uint32_t family_id = 0;

	MPASS(family_name != NULL);
	if (find_family(family_name) != NULL)
	@@ -111,13 +110,13 @@
	gf->family_version = family_version;
	gf->family_hdrsize = hdrsize;
	gf->family_attr_max = max_attr_idx;
	- NL_LOG(LOG_DEBUG2, "Registered family %s id %d", gf->family_name, gf->family_id);
	- family_id = gf->family_id;
	+ NL_LOG(LOG_DEBUG2, "Registered family %s id %d", gf->family_name,
	+ gf->family_id);
	EVENTHANDLER_INVOKE(genl_family_event, gf, CTRL_CMD_NEWFAMILY);

	GENL_UNLOCK();

	- return (family_id);
	+ return (gf->family_id);
	}

	static void