diff options
author | Jon Maloy <jon.maloy@ericsson.com> | 2018-02-15 04:40:49 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-02-16 15:26:34 -0500 |
commit | 5c45ab24ac77ea32eae7d3576cf37c3ddb259f80 (patch) | |
tree | d8a46d20cdeb90d3a625eaa71d1a71293635e0d4 /net/tipc/subscr.h | |
parent | da0a75e86ae230f92743c073843d3ea35bd061af (diff) |
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.h | 4 |
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; | |||
56 | */ | 56 | */ |
57 | struct tipc_subscription { | 57 | struct tipc_subscription { |
58 | struct kref kref; | 58 | struct kref kref; |
59 | struct tipc_server *server; | 59 | struct net *net; |
60 | struct timer_list timer; | 60 | struct timer_list timer; |
61 | struct list_head nameseq_list; | 61 | struct list_head nameseq_list; |
62 | struct list_head sub_list; | 62 | struct list_head sub_list; |
@@ -66,7 +66,7 @@ struct tipc_subscription { | |||
66 | spinlock_t lock; /* serialize up/down and timer events */ | 66 | spinlock_t lock; /* serialize up/down and timer events */ |
67 | }; | 67 | }; |
68 | 68 | ||
69 | struct tipc_subscription *tipc_sub_subscribe(struct tipc_server *srv, | 69 | struct tipc_subscription *tipc_sub_subscribe(struct net *net, |
70 | struct tipc_subscr *s, | 70 | struct tipc_subscr *s, |
71 | int conid); | 71 | int conid); |
72 | void tipc_sub_unsubscribe(struct tipc_subscription *sub); | 72 | void tipc_sub_unsubscribe(struct tipc_subscription *sub); |