diff options
| author | Allan Stephens <Allan.Stephens@windriver.com> | 2010-12-31 18:59:22 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-01 13:57:51 -0800 |
| commit | b0c1e928c85023c73780b5d9873406ccf1cd8019 (patch) | |
| tree | f5c7f9e15f4eda8a7b94660de1748da8dd41fcab /net/tipc/port.c | |
| parent | aa70200e001fc4d76552c974c94f65ab26020203 (diff) | |
| download | linux-b0c1e928c85023c73780b5d9873406ccf1cd8019.tar.gz linux-b0c1e928c85023c73780b5d9873406ccf1cd8019.tar.bz2 linux-b0c1e928c85023c73780b5d9873406ccf1cd8019.zip | |
tipc: Remove user registry subsystem
Eliminates routines, data structures, and files that make up TIPC's
user registry. The user registry is no longer needed since the native
API routines that utilized it no longer exist and there are no longer
any internal TIPC services that use it.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/port.c')
| -rw-r--r-- | net/tipc/port.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/net/tipc/port.c b/net/tipc/port.c index c033cb87b964..33d0b3b7175f 100644 --- a/net/tipc/port.c +++ b/net/tipc/port.c @@ -38,7 +38,6 @@ #include "config.h" #include "port.h" #include "name_table.h" -#include "user_reg.h" /* Connection management: */ #define PROBING_INTERVAL 3600000 /* [ms] => 1 h */ @@ -272,7 +271,6 @@ int tipc_deleteport(u32 ref) tipc_nodesub_unsubscribe(&p_ptr->subscription); } if (p_ptr->user_port) { - tipc_reg_remove_port(p_ptr->user_port); kfree(p_ptr->user_port); } @@ -934,12 +932,10 @@ void tipc_acknowledge(u32 ref, u32 ack) } /* - * tipc_createport(): user level call. Will add port to - * registry if non-zero user_ref. + * tipc_createport(): user level call. */ -int tipc_createport(u32 user_ref, - void *usr_handle, +int tipc_createport(void *usr_handle, unsigned int importance, tipc_msg_err_event error_cb, tipc_named_msg_err_event named_error_cb, @@ -966,7 +962,6 @@ int tipc_createport(u32 user_ref, } p_ptr->user_port = up_ptr; - up_ptr->user_ref = user_ref; up_ptr->usr_handle = usr_handle; up_ptr->ref = p_ptr->publ.ref; up_ptr->err_cb = error_cb; @@ -976,8 +971,6 @@ int tipc_createport(u32 user_ref, up_ptr->named_msg_cb = named_msg_cb; up_ptr->conn_msg_cb = conn_msg_cb; up_ptr->continue_event_cb = continue_event_cb; - INIT_LIST_HEAD(&up_ptr->uport_list); - tipc_reg_add_port(up_ptr); *portref = p_ptr->publ.ref; tipc_port_unlock(p_ptr); return 0; |