[TIPC]: Fix semaphore handling.

[safe/jmp/linux-2.6] / net / tipc / netlink.c

diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c
index 6fe95ac..6a7f7b4 100644 (file)
--- a/net/tipc/netlink.c
+++ b/net/tipc/netlink.c
@@ -1,6 +1,6 @@
 /*
  * net/tipc/netlink.c: TIPC configuration handling
- * 
+ *
  * Copyright (c) 2005-2006, Ericsson AB
  * Copyright (c) 2005, Wind River Systems
  * All rights reserved.
@@ -47,32 +47,31 @@ static int handle_cmd(struct sk_buff *skb, struct genl_info *info)
        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);
+               rep_buf = tipc_cfg_reply_error_string(TIPC_CFG_NOT_NET_ADMIN);
        else
-               rep_buf = cfg_do_cmd(req_userhdr->dest,
-                                    req_userhdr->cmd,
-                                    NLMSG_DATA(req_nlh) + GENL_HDRLEN + TIPC_GENL_HDRLEN,
-                                    NLMSG_PAYLOAD(req_nlh, GENL_HDRLEN + TIPC_GENL_HDRLEN),
-                                    hdr_space);
+               rep_buf = tipc_cfg_do_cmd(req_userhdr->dest,
+                                         req_userhdr->cmd,
+                                         NLMSG_DATA(req_nlh) + GENL_HDRLEN + TIPC_GENL_HDRLEN,
+                                         NLMSG_PAYLOAD(req_nlh, GENL_HDRLEN + TIPC_GENL_HDRLEN),
+                                         hdr_space);
 
        if (rep_buf) {
                skb_push(rep_buf, hdr_space);
-               rep_nlh = (struct nlmsghdr *)rep_buf->data;
+               rep_nlh = nlmsg_hdr(rep_buf);
                memcpy(rep_nlh, req_nlh, hdr_space);
                rep_nlh->nlmsg_len = rep_buf->len;
-               genlmsg_unicast(rep_buf, req_nlh->nlmsg_pid);
+               genlmsg_unicast(rep_buf, NETLINK_CB(skb).pid);
        }
 
-        return 0;
+       return 0;
 }
 
 static struct genl_family family = {
-        .id            = GENL_ID_GENERATE,
-        .name          = TIPC_GENL_NAME,
-        .version       = TIPC_GENL_VERSION,
-        .hdrsize       = TIPC_GENL_HDRLEN,
-        .maxattr       = 0,
-       .owner          = THIS_MODULE,
+       .id             = GENL_ID_GENERATE,
+       .name           = TIPC_GENL_NAME,
+       .version        = TIPC_GENL_VERSION,
+       .hdrsize        = TIPC_GENL_HDRLEN,
+       .maxattr        = 0,
 };
 
 static struct genl_ops ops = {
@@ -82,7 +81,7 @@ static struct genl_ops ops = {
 
 static int family_registered = 0;
 
-int netlink_start(void)
+int tipc_netlink_start(void)
 {
 
 
@@ -94,7 +93,7 @@ int netlink_start(void)
        if (genl_register_ops(&family, &ops))
                goto err_unregister;
 
-        return 0;
+       return 0;
 
  err_unregister:
        genl_unregister_family(&family);
@@ -104,7 +103,7 @@ int netlink_start(void)
        return -EFAULT;
 }
 
-void netlink_stop(void)
+void tipc_netlink_stop(void)
 {
        if (family_registered) {
                genl_unregister_family(&family);