diff options
| author | Jon Maloy <jon.maloy@ericsson.com> | 2018-02-15 10:40:47 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-02-16 21:26:34 +0100 |
| commit | 242e82cc95f6b4e83e1771f9915edcb2a63708e1 (patch) | |
| tree | 00821f92cfc58231f4054d27fe5297b7f36a8836 /net/tipc/subscr.h | |
| parent | tipc: simplify endianness handling in topology subscriber (diff) | |
| download | linux-242e82cc95f6b4e83e1771f9915edcb2a63708e1.tar.xz linux-242e82cc95f6b4e83e1771f9915edcb2a63708e1.zip | |
tipc: collapse subscription creation functions
After the previous changes it becomes logical to collapse the two-level
creation of subscription instances into one. We do that here.
We also rename the creation and deletion functions for more consistency.
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/subscr.h')
| -rw-r--r-- | net/tipc/subscr.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/tipc/subscr.h b/net/tipc/subscr.h index db80e41bba08..2d35f1046754 100644 --- a/net/tipc/subscr.h +++ b/net/tipc/subscr.h @@ -1,7 +1,7 @@ /* * net/tipc/subscr.h: Include file for TIPC network topology service * - * Copyright (c) 2003-2006, Ericsson AB + * Copyright (c) 2003-2017, Ericsson AB * Copyright (c) 2005-2007, 2012-2013, Wind River Systems * All rights reserved. * @@ -39,8 +39,8 @@ #include "server.h" -#define TIPC_MAX_SUBSCRIPTIONS 65535 -#define TIPC_MAX_PUBLICATIONS 65535 +#define TIPC_MAX_SUBSCR 65535 +#define TIPC_MAX_PUBLICATIONS 65535 struct tipc_subscription; struct tipc_conn; @@ -66,10 +66,10 @@ struct tipc_subscription { spinlock_t lock; /* serialize up/down and timer events */ }; -struct tipc_subscription *tipc_subscrp_subscribe(struct tipc_server *srv, - struct tipc_subscr *s, - int conid); -void tipc_sub_delete(struct tipc_subscription *sub); +struct tipc_subscription *tipc_sub_subscribe(struct tipc_server *srv, + struct tipc_subscr *s, + int conid); +void tipc_sub_unsubscribe(struct tipc_subscription *sub); int tipc_subscrp_check_overlap(struct tipc_name_seq *seq, u32 found_lower, u32 found_upper); |