diff options
Diffstat (limited to 'net/tipc/server.h')
-rw-r--r-- | net/tipc/server.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/net/tipc/server.h b/net/tipc/server.h index fcc72321362d..2de8709b467d 100644 --- a/net/tipc/server.h +++ b/net/tipc/server.h | |||
@@ -36,6 +36,7 @@ | |||
36 | #ifndef _TIPC_SERVER_H | 36 | #ifndef _TIPC_SERVER_H |
37 | #define _TIPC_SERVER_H | 37 | #define _TIPC_SERVER_H |
38 | 38 | ||
39 | #include "core.h" | ||
39 | #include <linux/idr.h> | 40 | #include <linux/idr.h> |
40 | #include <linux/tipc.h> | 41 | #include <linux/tipc.h> |
41 | #include <net/net_namespace.h> | 42 | #include <net/net_namespace.h> |
@@ -68,7 +69,6 @@ struct tipc_server { | |||
68 | spinlock_t idr_lock; | 69 | spinlock_t idr_lock; |
69 | int idr_in_use; | 70 | int idr_in_use; |
70 | struct net *net; | 71 | struct net *net; |
71 | struct kmem_cache *rcvbuf_cache; | ||
72 | struct workqueue_struct *rcv_wq; | 72 | struct workqueue_struct *rcv_wq; |
73 | struct workqueue_struct *send_wq; | 73 | struct workqueue_struct *send_wq; |
74 | int max_rcvbuf_size; | 74 | int max_rcvbuf_size; |
@@ -76,19 +76,13 @@ struct tipc_server { | |||
76 | char name[TIPC_SERVER_NAME_LEN]; | 76 | char name[TIPC_SERVER_NAME_LEN]; |
77 | }; | 77 | }; |
78 | 78 | ||
79 | int tipc_conn_sendmsg(struct tipc_server *s, int conid, | 79 | void tipc_conn_queue_evt(struct tipc_server *s, int conid, |
80 | u32 evt, void *data, size_t len); | 80 | u32 event, struct tipc_event *evt); |
81 | 81 | ||
82 | bool tipc_topsrv_kern_subscr(struct net *net, u32 port, u32 type, u32 lower, | 82 | bool tipc_topsrv_kern_subscr(struct net *net, u32 port, u32 type, u32 lower, |
83 | u32 upper, u32 filter, int *conid); | 83 | u32 upper, u32 filter, int *conid); |
84 | void tipc_topsrv_kern_unsubscr(struct net *net, int conid); | 84 | void tipc_topsrv_kern_unsubscr(struct net *net, int conid); |
85 | 85 | ||
86 | /** | ||
87 | * tipc_conn_terminate - terminate connection with server | ||
88 | * | ||
89 | * Note: Must call it in process context since it might sleep | ||
90 | */ | ||
91 | void tipc_conn_terminate(struct tipc_server *s, int conid); | ||
92 | int tipc_server_start(struct tipc_server *s); | 86 | int tipc_server_start(struct tipc_server *s); |
93 | 87 | ||
94 | void tipc_server_stop(struct tipc_server *s); | 88 | void tipc_server_stop(struct tipc_server *s); |