commit 1dba9743337cabacea79e47ed6d709e636c5ed47
author Per Liden <per.liden@nospam.ericsson.com> Thu Jan 05 16:34:00 2006 +0100
committer David S. Miller <davem@sunset.davemloft.net> Thu Jan 12 14:06:32 2006 -0800
tree b5244bd1e0b798553a3ab8627b0b06ddbe52a749
parent b97bf3fd8f6a16966d4f18983b2c40993ff937d4

[TIPC] Use dynamically allocated family id with NETLINK_GENERIC

Signed-off-by: Per Liden <per.liden@nospam.ericsson.com>

net/tipc/netlink.c

diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c
index 35fbc79..08b974e 100644
--- a/net/tipc/netlink.c
+++ b/net/tipc/netlink.c
@@ -40,7 +40,7 @@
 	struct nlmsghdr *rep_nlh;
 	struct nlmsghdr *req_nlh = info->nlhdr;
 	struct tipc_genlmsghdr *req_userhdr = info->userhdr;
-	int hdr_space = NLMSG_SPACE(0);
+	int hdr_space = NLMSG_SPACE(GENL_HDRLEN + TIPC_GENL_HDRLEN);
 
 	if ((req_userhdr->cmd & 0xC000) && (!capable(CAP_NET_ADMIN)))
 		rep_buf = cfg_reply_error_string(TIPC_CFG_NOT_NET_ADMIN);
@@ -63,7 +63,7 @@
 }
 
 static struct genl_family family = {
-        .id		= TIPC_GENL_FAMILY,
+        .id		= GENL_ID_GENERATE,
         .name		= TIPC_GENL_NAME,
         .version	= TIPC_GENL_VERSION,
         .hdrsize	= TIPC_GENL_HDRLEN,