diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2006-01-18 17:23:54 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-18 17:23:54 -0500 |
commit | 27a7b0415f6e5c0ffdfb1ba42b9b96ddfbb78b8f (patch) | |
tree | 8107ee11c3fe7d3b4be36054af4475326af86d53 /net/tipc/netlink.c | |
parent | ad12583f46bcb6ce93ccd99fa063c0d701146b2e (diff) | |
parent | 4323add67792ced172d0d93b8b2e6187023115f1 (diff) |
Merge git://tipc.cslab.ericsson.net/pub/git/tipc
Diffstat (limited to 'net/tipc/netlink.c')
-rw-r--r-- | net/tipc/netlink.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c index 19b3f4022532..eb1bb4dce7af 100644 --- a/net/tipc/netlink.c +++ b/net/tipc/netlink.c | |||
@@ -47,13 +47,13 @@ static int handle_cmd(struct sk_buff *skb, struct genl_info *info) | |||
47 | int hdr_space = NLMSG_SPACE(GENL_HDRLEN + TIPC_GENL_HDRLEN); | 47 | int hdr_space = NLMSG_SPACE(GENL_HDRLEN + TIPC_GENL_HDRLEN); |
48 | 48 | ||
49 | if ((req_userhdr->cmd & 0xC000) && (!capable(CAP_NET_ADMIN))) | 49 | if ((req_userhdr->cmd & 0xC000) && (!capable(CAP_NET_ADMIN))) |
50 | rep_buf = cfg_reply_error_string(TIPC_CFG_NOT_NET_ADMIN); | 50 | rep_buf = tipc_cfg_reply_error_string(TIPC_CFG_NOT_NET_ADMIN); |
51 | else | 51 | else |
52 | rep_buf = cfg_do_cmd(req_userhdr->dest, | 52 | rep_buf = tipc_cfg_do_cmd(req_userhdr->dest, |
53 | req_userhdr->cmd, | 53 | req_userhdr->cmd, |
54 | NLMSG_DATA(req_nlh) + GENL_HDRLEN + TIPC_GENL_HDRLEN, | 54 | NLMSG_DATA(req_nlh) + GENL_HDRLEN + TIPC_GENL_HDRLEN, |
55 | NLMSG_PAYLOAD(req_nlh, GENL_HDRLEN + TIPC_GENL_HDRLEN), | 55 | NLMSG_PAYLOAD(req_nlh, GENL_HDRLEN + TIPC_GENL_HDRLEN), |
56 | hdr_space); | 56 | hdr_space); |
57 | 57 | ||
58 | if (rep_buf) { | 58 | if (rep_buf) { |
59 | skb_push(rep_buf, hdr_space); | 59 | skb_push(rep_buf, hdr_space); |
@@ -81,7 +81,7 @@ static struct genl_ops ops = { | |||
81 | 81 | ||
82 | static int family_registered = 0; | 82 | static int family_registered = 0; |
83 | 83 | ||
84 | int netlink_start(void) | 84 | int tipc_netlink_start(void) |
85 | { | 85 | { |
86 | 86 | ||
87 | 87 | ||
@@ -103,7 +103,7 @@ int netlink_start(void) | |||
103 | return -EFAULT; | 103 | return -EFAULT; |
104 | } | 104 | } |
105 | 105 | ||
106 | void netlink_stop(void) | 106 | void tipc_netlink_stop(void) |
107 | { | 107 | { |
108 | if (family_registered) { | 108 | if (family_registered) { |
109 | genl_unregister_family(&family); | 109 | genl_unregister_family(&family); |