aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/port.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/tipc/port.c')
-rw-r--r--net/tipc/port.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/net/tipc/port.c b/net/tipc/port.c
index c033cb87b96..33d0b3b7175 100644
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
@@ -38,7 +38,6 @@
38#include "config.h" 38#include "config.h"
39#include "port.h" 39#include "port.h"
40#include "name_table.h" 40#include "name_table.h"
41#include "user_reg.h"
42 41
43/* Connection management: */ 42/* Connection management: */
44#define PROBING_INTERVAL 3600000 /* [ms] => 1 h */ 43#define PROBING_INTERVAL 3600000 /* [ms] => 1 h */
@@ -272,7 +271,6 @@ int tipc_deleteport(u32 ref)
272 tipc_nodesub_unsubscribe(&p_ptr->subscription); 271 tipc_nodesub_unsubscribe(&p_ptr->subscription);
273 } 272 }
274 if (p_ptr->user_port) { 273 if (p_ptr->user_port) {
275 tipc_reg_remove_port(p_ptr->user_port);
276 kfree(p_ptr->user_port); 274 kfree(p_ptr->user_port);
277 } 275 }
278 276
@@ -934,12 +932,10 @@ void tipc_acknowledge(u32 ref, u32 ack)
934} 932}
935 933
936/* 934/*
937 * tipc_createport(): user level call. Will add port to 935 * tipc_createport(): user level call.
938 * registry if non-zero user_ref.
939 */ 936 */
940 937
941int tipc_createport(u32 user_ref, 938int tipc_createport(void *usr_handle,
942 void *usr_handle,
943 unsigned int importance, 939 unsigned int importance,
944 tipc_msg_err_event error_cb, 940 tipc_msg_err_event error_cb,
945 tipc_named_msg_err_event named_error_cb, 941 tipc_named_msg_err_event named_error_cb,
@@ -966,7 +962,6 @@ int tipc_createport(u32 user_ref,
966 } 962 }
967 963
968 p_ptr->user_port = up_ptr; 964 p_ptr->user_port = up_ptr;
969 up_ptr->user_ref = user_ref;
970 up_ptr->usr_handle = usr_handle; 965 up_ptr->usr_handle = usr_handle;
971 up_ptr->ref = p_ptr->publ.ref; 966 up_ptr->ref = p_ptr->publ.ref;
972 up_ptr->err_cb = error_cb; 967 up_ptr->err_cb = error_cb;
@@ -976,8 +971,6 @@ int tipc_createport(u32 user_ref,
976 up_ptr->named_msg_cb = named_msg_cb; 971 up_ptr->named_msg_cb = named_msg_cb;
977 up_ptr->conn_msg_cb = conn_msg_cb; 972 up_ptr->conn_msg_cb = conn_msg_cb;
978 up_ptr->continue_event_cb = continue_event_cb; 973 up_ptr->continue_event_cb = continue_event_cb;
979 INIT_LIST_HEAD(&up_ptr->uport_list);
980 tipc_reg_add_port(up_ptr);
981 *portref = p_ptr->publ.ref; 974 *portref = p_ptr->publ.ref;
982 tipc_port_unlock(p_ptr); 975 tipc_port_unlock(p_ptr);
983 return 0; 976 return 0;