aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/subscr.h
diff options
context:
space:
mode:
authorJon Maloy <jon.maloy@ericsson.com>2018-02-15 10:40:49 +0100
committerDavid S. Miller <davem@davemloft.net>2018-02-16 15:26:34 -0500
commit5c45ab24ac77ea32eae7d3576cf37c3ddb259f80 (patch)
treed8a46d20cdeb90d3a625eaa71d1a71293635e0d4 /net/tipc/subscr.h
parenttipc: some prefix changes (diff)
downloadlinux-dev-5c45ab24ac77ea32eae7d3576cf37c3ddb259f80.tar.xz
linux-dev-5c45ab24ac77ea32eae7d3576cf37c3ddb259f80.zip
tipc: make struct tipc_server private for server.c
In order to narrow the interface and dependencies between the topology server and the subscription/binding table functionality we move struct tipc_server inside the file server.c. This requires some code adaptations in other files, but those are mostly minor. The most important change is that we have to move the start/stop functions for the topology server to server.c, where they logically belong anyway. 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.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/subscr.h b/net/tipc/subscr.h
index 720932896ba6..82ba61afe638 100644
--- a/net/tipc/subscr.h
+++ b/net/tipc/subscr.h
@@ -56,7 +56,7 @@ struct tipc_conn;
*/
struct tipc_subscription {
struct kref kref;
- struct tipc_server *server;
+ struct net *net;
struct timer_list timer;
struct list_head nameseq_list;
struct list_head sub_list;
@@ -66,7 +66,7 @@ struct tipc_subscription {
spinlock_t lock; /* serialize up/down and timer events */
};
-struct tipc_subscription *tipc_sub_subscribe(struct tipc_server *srv,
+struct tipc_subscription *tipc_sub_subscribe(struct net *net,
struct tipc_subscr *s,
int conid);
void tipc_sub_unsubscribe(struct tipc_subscription *sub);