diff options
Diffstat (limited to 'net/tipc/socket.c')
-rw-r--r-- | net/tipc/socket.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index d21f8c0cd25a..67253bfcd702 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
@@ -42,9 +42,7 @@ | |||
42 | #include <linux/mm.h> | 42 | #include <linux/mm.h> |
43 | #include <linux/slab.h> | 43 | #include <linux/slab.h> |
44 | #include <linux/poll.h> | 44 | #include <linux/poll.h> |
45 | #include <linux/version.h> | ||
46 | #include <linux/fcntl.h> | 45 | #include <linux/fcntl.h> |
47 | #include <linux/version.h> | ||
48 | #include <asm/semaphore.h> | 46 | #include <asm/semaphore.h> |
49 | #include <asm/string.h> | 47 | #include <asm/string.h> |
50 | #include <asm/atomic.h> | 48 | #include <asm/atomic.h> |
@@ -1185,7 +1183,7 @@ static u32 dispatch(struct tipc_port *tport, struct sk_buff *buf) | |||
1185 | if (unlikely(msg_errcode(msg) && (sock->state == SS_CONNECTED))) { | 1183 | if (unlikely(msg_errcode(msg) && (sock->state == SS_CONNECTED))) { |
1186 | sock->state = SS_DISCONNECTING; | 1184 | sock->state = SS_DISCONNECTING; |
1187 | /* Note: Use signal since port lock is already taken! */ | 1185 | /* Note: Use signal since port lock is already taken! */ |
1188 | k_signal((Handler)async_disconnect, tport->ref); | 1186 | tipc_k_signal((Handler)async_disconnect, tport->ref); |
1189 | } | 1187 | } |
1190 | 1188 | ||
1191 | /* Enqueue message (finally!) */ | 1189 | /* Enqueue message (finally!) */ |
@@ -1685,11 +1683,11 @@ static struct proto tipc_proto = { | |||
1685 | }; | 1683 | }; |
1686 | 1684 | ||
1687 | /** | 1685 | /** |
1688 | * socket_init - initialize TIPC socket interface | 1686 | * tipc_socket_init - initialize TIPC socket interface |
1689 | * | 1687 | * |
1690 | * Returns 0 on success, errno otherwise | 1688 | * Returns 0 on success, errno otherwise |
1691 | */ | 1689 | */ |
1692 | int socket_init(void) | 1690 | int tipc_socket_init(void) |
1693 | { | 1691 | { |
1694 | int res; | 1692 | int res; |
1695 | 1693 | ||
@@ -1712,9 +1710,9 @@ int socket_init(void) | |||
1712 | } | 1710 | } |
1713 | 1711 | ||
1714 | /** | 1712 | /** |
1715 | * sock_stop - stop TIPC socket interface | 1713 | * tipc_socket_stop - stop TIPC socket interface |
1716 | */ | 1714 | */ |
1717 | void socket_stop(void) | 1715 | void tipc_socket_stop(void) |
1718 | { | 1716 | { |
1719 | if (!sockets_enabled) | 1717 | if (!sockets_enabled) |
1720 | return; | 1718 | return; |