From: Per Liden Date: Thu, 5 Jan 2006 15:34:00 +0000 (+0100) Subject: [TIPC] Use dynamically allocated family id with NETLINK_GENERIC X-Git-Tag: v2.6.16-rc1~173^2~14 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dba9743337cabacea79e47ed6d709e636c5ed47;p=linux-2.6 [TIPC] Use dynamically allocated family id with NETLINK_GENERIC Signed-off-by: Per Liden --- diff --git a/include/linux/tipc.h b/include/linux/tipc.h index ca754f3317..1faab77626 100644 --- a/include/linux/tipc.h +++ b/include/linux/tipc.h @@ -539,7 +539,6 @@ static inline void TLV_LIST_STEP(struct tlv_list_desc *list) * Configuration messages exchanged via NETLINK_GENERIC use the following * family id, name, version and command. */ -#define TIPC_GENL_FAMILY 0x222 #define TIPC_GENL_NAME "TIPC" #define TIPC_GENL_VERSION 0x1 #define TIPC_GENL_CMD 0x1 diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c index 35fbc79336..08b974ed91 100644 --- a/net/tipc/netlink.c +++ b/net/tipc/netlink.c @@ -40,7 +40,7 @@ static int handle_cmd(struct sk_buff *skb, struct genl_info *info) 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 int handle_cmd(struct sk_buff *skb, struct genl_info *info) } 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,