diff options
Diffstat (limited to 'net/tipc/subscr.h')
-rw-r--r-- | net/tipc/subscr.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/net/tipc/subscr.h b/net/tipc/subscr.h index 92ee18cc5fe6..be60103082c9 100644 --- a/net/tipc/subscr.h +++ b/net/tipc/subscr.h | |||
@@ -50,21 +50,15 @@ struct tipc_subscriber; | |||
50 | * @subscriber: pointer to its subscriber | 50 | * @subscriber: pointer to its subscriber |
51 | * @seq: name sequence associated with subscription | 51 | * @seq: name sequence associated with subscription |
52 | * @net: point to network namespace | 52 | * @net: point to network namespace |
53 | * @timeout: duration of subscription (in ms) | ||
54 | * @filter: event filtering to be done for subscription | ||
55 | * @timer: timer governing subscription duration (optional) | 53 | * @timer: timer governing subscription duration (optional) |
56 | * @nameseq_list: adjacent subscriptions in name sequence's subscription list | 54 | * @nameseq_list: adjacent subscriptions in name sequence's subscription list |
57 | * @subscrp_list: adjacent subscriptions in subscriber's subscription list | 55 | * @subscrp_list: adjacent subscriptions in subscriber's subscription list |
58 | * @server_ref: object reference of server port associated with subscription | ||
59 | * @swap: indicates if subscriber uses opposite endianness in its messages | 56 | * @swap: indicates if subscriber uses opposite endianness in its messages |
60 | * @evt: template for events generated by subscription | 57 | * @evt: template for events generated by subscription |
61 | */ | 58 | */ |
62 | struct tipc_subscription { | 59 | struct tipc_subscription { |
63 | struct tipc_subscriber *subscriber; | 60 | struct tipc_subscriber *subscriber; |
64 | struct tipc_name_seq seq; | ||
65 | struct net *net; | 61 | struct net *net; |
66 | unsigned long timeout; | ||
67 | u32 filter; | ||
68 | struct timer_list timer; | 62 | struct timer_list timer; |
69 | struct list_head nameseq_list; | 63 | struct list_head nameseq_list; |
70 | struct list_head subscrp_list; | 64 | struct list_head subscrp_list; |
@@ -72,11 +66,14 @@ struct tipc_subscription { | |||
72 | struct tipc_event evt; | 66 | struct tipc_event evt; |
73 | }; | 67 | }; |
74 | 68 | ||
75 | int tipc_subscrp_check_overlap(struct tipc_subscription *sub, u32 found_lower, | 69 | int tipc_subscrp_check_overlap(struct tipc_name_seq *seq, u32 found_lower, |
76 | u32 found_upper); | 70 | u32 found_upper); |
77 | void tipc_subscrp_report_overlap(struct tipc_subscription *sub, | 71 | void tipc_subscrp_report_overlap(struct tipc_subscription *sub, |
78 | u32 found_lower, u32 found_upper, u32 event, | 72 | u32 found_lower, u32 found_upper, u32 event, |
79 | u32 port_ref, u32 node, int must); | 73 | u32 port_ref, u32 node, int must); |
74 | void tipc_subscrp_convert_seq(struct tipc_name_seq *in, int swap, | ||
75 | struct tipc_name_seq *out); | ||
76 | u32 tipc_subscrp_convert_seq_type(u32 type, int swap); | ||
80 | int tipc_topsrv_start(struct net *net); | 77 | int tipc_topsrv_start(struct net *net); |
81 | void tipc_topsrv_stop(struct net *net); | 78 | void tipc_topsrv_stop(struct net *net); |
82 | 79 | ||