summaryrefslogtreecommitdiffstats
path: root/net/tipc/subscr.h
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2015-05-03 22:36:44 -0400
committerDavid S. Miller <davem@davemloft.net>2015-05-04 15:04:00 -0400
commit57f1d1868fb5d71a20bfb1bc807274471c2ff459 (patch)
treeeea2c884ece025f8ac5606d52808ce66ad896b18 /net/tipc/subscr.h
parent29a1ff6596fc6fbd1a2de0f2301bcd301dfcb4eb (diff)
tipc: rename functions defined in subscr.c
When a topology server accepts a connection request from its client, it allocates a connection instance and a tipc_subscriber structure object. The former is used to communicate with client, and the latter is often treated as a subscriber which manages all subscription events requested from a same client. When a topology server receives a request of subscribing name services from a client through the connection, it creates a tipc_subscription structure instance which is seen as a subscription recording what name services are subscribed. In order to manage all subscriptions from a same client, topology server links them into the subscrp_list of the subscriber. So subscriber and subscription completely represents different meanings respectively, but function names associated with them make us so confused that we are unable to easily tell which function is against subscriber and which is to subscription. So we want to eliminate the confusion by renaming them. Signed-off-by: Ying Xue <ying.xue@windriver.com> Reviewed-by: Jon Maloy <jon.maloy@ericson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/subscr.h')
-rw-r--r--net/tipc/subscr.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/net/tipc/subscr.h b/net/tipc/subscr.h
index 33488bd9fe3c..92ee18cc5fe6 100644
--- a/net/tipc/subscr.h
+++ b/net/tipc/subscr.h
@@ -54,7 +54,7 @@ struct tipc_subscriber;
54 * @filter: event filtering to be done for subscription 54 * @filter: event filtering to be done for subscription
55 * @timer: timer governing subscription duration (optional) 55 * @timer: timer governing subscription duration (optional)
56 * @nameseq_list: adjacent subscriptions in name sequence's subscription list 56 * @nameseq_list: adjacent subscriptions in name sequence's subscription list
57 * @subscription_list: adjacent subscriptions in subscriber's subscription list 57 * @subscrp_list: adjacent subscriptions in subscriber's subscription list
58 * @server_ref: object reference of server port associated with subscription 58 * @server_ref: object reference of server port associated with subscription
59 * @swap: indicates if subscriber uses opposite endianness in its messages 59 * @swap: indicates if subscriber uses opposite endianness in its messages
60 * @evt: template for events generated by subscription 60 * @evt: template for events generated by subscription
@@ -67,17 +67,17 @@ struct tipc_subscription {
67 u32 filter; 67 u32 filter;
68 struct timer_list timer; 68 struct timer_list timer;
69 struct list_head nameseq_list; 69 struct list_head nameseq_list;
70 struct list_head subscription_list; 70 struct list_head subscrp_list;
71 int swap; 71 int swap;
72 struct tipc_event evt; 72 struct tipc_event evt;
73}; 73};
74 74
75int tipc_subscr_overlap(struct tipc_subscription *sub, u32 found_lower, 75int tipc_subscrp_check_overlap(struct tipc_subscription *sub, u32 found_lower,
76 u32 found_upper); 76 u32 found_upper);
77void tipc_subscr_report_overlap(struct tipc_subscription *sub, u32 found_lower, 77void tipc_subscrp_report_overlap(struct tipc_subscription *sub,
78 u32 found_upper, u32 event, u32 port_ref, 78 u32 found_lower, u32 found_upper, u32 event,
79 u32 node, int must); 79 u32 port_ref, u32 node, int must);
80int tipc_subscr_start(struct net *net); 80int tipc_topsrv_start(struct net *net);
81void tipc_subscr_stop(struct net *net); 81void tipc_topsrv_stop(struct net *net);
82 82
83#endif 83#endif