These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / net / tipc / subscr.h

diff --git a/kernel/net/tipc/subscr.h b/kernel/net/tipc/subscr.h
index 33488bd..92ee18c 100644 (file)
--- a/kernel/net/tipc/subscr.h
+++ b/kernel/net/tipc/subscr.h
@@ -54,7 +54,7 @@ struct tipc_subscriber;
  * @filter: event filtering to be done for subscription
  * @timer: timer governing subscription duration (optional)
  * @nameseq_list: adjacent subscriptions in name sequence's subscription list
- * @subscription_list: adjacent subscriptions in subscriber's subscription list
+ * @subscrp_list: adjacent subscriptions in subscriber's subscription list
  * @server_ref: object reference of server port associated with subscription
  * @swap: indicates if subscriber uses opposite endianness in its messages
  * @evt: template for events generated by subscription
@@ -67,17 +67,17 @@ struct tipc_subscription {
        u32 filter;
        struct timer_list timer;
        struct list_head nameseq_list;
-       struct list_head subscription_list;
+       struct list_head subscrp_list;
        int swap;
        struct tipc_event evt;
 };
 
-int tipc_subscr_overlap(struct tipc_subscription *sub, u32 found_lower,
-                       u32 found_upper);
-void tipc_subscr_report_overlap(struct tipc_subscription *sub, u32 found_lower,
-                               u32 found_upper, u32 event, u32 port_ref,
-                               u32 node, int must);
-int tipc_subscr_start(struct net *net);
-void tipc_subscr_stop(struct net *net);
+int tipc_subscrp_check_overlap(struct tipc_subscription *sub, u32 found_lower,
+                              u32 found_upper);
+void tipc_subscrp_report_overlap(struct tipc_subscription *sub,
+                                u32 found_lower, u32 found_upper, u32 event,
+                                u32 port_ref, u32 node, int must);
+int tipc_topsrv_start(struct net *net);
+void tipc_topsrv_stop(struct net *net);
 
 #endif