Skip to content

L
linux-davinci
Commit 1dba9743 authored by Per Liden's avatar Per Liden Committed by David S. Miller
Browse files
Options

[TIPC] Use dynamically allocated family id with NETLINK_GENERIC 

Signed-off-by: default avatarPer Liden <per.liden@nospam.ericsson.com>
parent b97bf3fd
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
include/linux/tipc.h
View file @ 1dba9743
...@@ -539,7 +539,6 @@ static inline void TLV_LIST_STEP(struct tlv_list_desc *list) ...@@ -539,7 +539,6 @@ static inline void TLV_LIST_STEP(struct tlv_list_desc *list)
* Configuration messages exchanged via NETLINK_GENERIC use the following * Configuration messages exchanged via NETLINK_GENERIC use the following
* family id, name, version and command. * family id, name, version and command.
*/ */
#define TIPC_GENL_FAMILY 0x222
#define TIPC_GENL_NAME "TIPC" #define TIPC_GENL_NAME "TIPC"
#define TIPC_GENL_VERSION 0x1 #define TIPC_GENL_VERSION 0x1
#define TIPC_GENL_CMD 0x1 #define TIPC_GENL_CMD 0x1
......
net/tipc/netlink.c
View file @ 1dba9743
...@@ -40,7 +40,7 @@ static int handle_cmd(struct sk_buff *skb, struct genl_info *info) ...@@ -40,7 +40,7 @@ static int handle_cmd(struct sk_buff *skb, struct genl_info *info)
struct nlmsghdr *rep_nlh; struct nlmsghdr *rep_nlh;
struct nlmsghdr *req_nlh = info->nlhdr; struct nlmsghdr *req_nlh = info->nlhdr;
struct tipc_genlmsghdr *req_userhdr = info->userhdr; 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))) if ((req_userhdr->cmd & 0xC000) && (!capable(CAP_NET_ADMIN)))
rep_buf = cfg_reply_error_string(TIPC_CFG_NOT_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) ...@@ -63,7 +63,7 @@ static int handle_cmd(struct sk_buff *skb, struct genl_info *info)
} }
static struct genl_family family = { static struct genl_family family = {
.id = TIPC_GENL_FAMILY, .id = GENL_ID_GENERATE,
.name = TIPC_GENL_NAME, .name = TIPC_GENL_NAME,
.version = TIPC_GENL_VERSION, .version = TIPC_GENL_VERSION,
.hdrsize = TIPC_GENL_HDRLEN, .hdrsize = TIPC_GENL_HDRLEN,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment