[ACPI] merge 3549 4320 4485 4588 4980 5483 5651 acpica asus fops pnpacpi branches...

[linux-2.6] / net / tipc / socket.c

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 1120d0340310db9fe1c51e283a10d672ffaf3a95..67253bfcd70269246d0675b112cdc2fd16e9f9d6 100644 (file)
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -1,9 +1,8 @@
 /*
  * net/tipc/socket.c: TIPC socket API
  * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2001-2006, Ericsson AB
  * Copyright (c) 2004-2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,9 +42,7 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/poll.h>
-#include <linux/version.h>
 #include <linux/fcntl.h>
-#include <linux/version.h>
 #include <asm/semaphore.h>
 #include <asm/string.h>
 #include <asm/atomic.h>
@@ -1186,7 +1183,7 @@ static u32 dispatch(struct tipc_port *tport, struct sk_buff *buf)
        if (unlikely(msg_errcode(msg) && (sock->state == SS_CONNECTED))) {
                sock->state = SS_DISCONNECTING;
                /* Note: Use signal since port lock is already taken! */
-               k_signal((Handler)async_disconnect, tport->ref);
+               tipc_k_signal((Handler)async_disconnect, tport->ref);
        }
 
        /* Enqueue message (finally!) */
@@ -1686,23 +1683,23 @@ static struct proto tipc_proto = {
 };
 
 /**
- * socket_init - initialize TIPC socket interface
+ * tipc_socket_init - initialize TIPC socket interface
  * 
  * Returns 0 on success, errno otherwise
  */
-int socket_init(void)
+int tipc_socket_init(void)
 {
        int res;
 
         res = proto_register(&tipc_proto, 1);
        if (res) {
-               err("Unable to register TIPC protocol type\n");
+               err("Failed to register TIPC protocol type\n");
                goto out;
        }
 
        res = sock_register(&tipc_family_ops);
        if (res) {
-               err("Unable to register TIPC socket type\n");
+               err("Failed to register TIPC socket type\n");
                proto_unregister(&tipc_proto);
                goto out;
        }
@@ -1713,9 +1710,9 @@ int socket_init(void)
 }
 
 /**
- * sock_stop - stop TIPC socket interface
+ * tipc_socket_stop - stop TIPC socket interface
  */
-void socket_stop(void)
+void tipc_socket_stop(void)
 {
        if (!sockets_enabled)
                return;