diff options
| author |   Jon Maloy <jon.maloy@ericsson.com> | 2018-02-15 10:40:45 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-02-16 15:26:33 -0500 |
| commit | 414574a0af36d329f560f542e650cc4a81cc1d69 (patch) | |
| tree | f4a319ea2214e6fb3f8a12521001bf0b50add3a2 /net/tipc/server.h | |
| parent | tipc: eliminate struct tipc_subscriber (diff) | |
| download | linux-dev-414574a0af36d329f560f542e650cc4a81cc1d69.tar.xz linux-dev-414574a0af36d329f560f542e650cc4a81cc1d69.zip | |
tipc: simplify interaction between subscription and topology connection
The message transmission and reception in the topology server is more
generic than is currently necessary. By basing the funtionality on the
fact that we only send items of type struct tipc_event and always
receive items of struct tipc_subcr we can make several simplifications,
and also get rid of some unnecessary dynamic memory allocations.
Acked-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
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 @@ #ifndef _TIPC_SERVER_H #define _TIPC_SERVER_H +#include "core.h" #include <linux/idr.h> #include <linux/tipc.h> #include <net/net_namespace.h> @@ -68,7 +69,6 @@ struct tipc_server { spinlock_t idr_lock; int idr_in_use; struct net *net; - struct kmem_cache *rcvbuf_cache; struct workqueue_struct *rcv_wq; struct workqueue_struct *send_wq; int max_rcvbuf_size; @@ -76,19 +76,13 @@ struct tipc_server { char name[TIPC_SERVER_NAME_LEN]; }; -int tipc_conn_sendmsg(struct tipc_server *s, int conid, - u32 evt, void *data, size_t len); +void tipc_conn_queue_evt(struct tipc_server *s, int conid, + u32 event, struct tipc_event *evt); bool tipc_topsrv_kern_subscr(struct net *net, u32 port, u32 type, u32 lower, u32 upper, u32 filter, int *conid); void tipc_topsrv_kern_unsubscr(struct net *net, int conid); -/** - * tipc_conn_terminate - terminate connection with server - * - * Note: Must call it in process context since it might sleep - */ -void tipc_conn_terminate(struct tipc_server *s, int conid); int tipc_server_start(struct tipc_server *s); void tipc_server_stop(struct tipc_server *s); |