diff options
| author | Per Liden <per.liden@nospam.ericsson.com> | 2006-01-05 16:34:00 +0100 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-12 14:06:32 -0800 |
| commit | 1dba9743337cabacea79e47ed6d709e636c5ed47 (patch) | |
| tree | b5244bd1e0b798553a3ab8627b0b06ddbe52a749 | |
| parent | b97bf3fd8f6a16966d4f18983b2c40993ff937d4 (diff) | |
| download | linux-1dba9743337cabacea79e47ed6d709e636c5ed47.tar.gz linux-1dba9743337cabacea79e47ed6d709e636c5ed47.tar.bz2 linux-1dba9743337cabacea79e47ed6d709e636c5ed47.zip | |
[TIPC] Use dynamically allocated family id with NETLINK_GENERIC
Signed-off-by: Per Liden <per.liden@nospam.ericsson.com>
| -rw-r--r-- | include/linux/tipc.h | 1 | ||||
| -rw-r--r-- | net/tipc/netlink.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/tipc.h b/include/linux/tipc.h index ca754f3317f2..1faab77626f2 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 35fbc7933604..08b974ed9109 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, |