diff options
Diffstat (limited to 'net/tipc/subscr.h')
-rw-r--r-- | net/tipc/subscr.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/tipc/subscr.h b/net/tipc/subscr.h index 218d2e07f0cc..43e6d6332a02 100644 --- a/net/tipc/subscr.h +++ b/net/tipc/subscr.h | |||
@@ -2,7 +2,7 @@ | |||
2 | * net/tipc/subscr.h: Include file for TIPC network topology service | 2 | * net/tipc/subscr.h: Include file for TIPC network topology service |
3 | * | 3 | * |
4 | * Copyright (c) 2003-2006, Ericsson AB | 4 | * Copyright (c) 2003-2006, Ericsson AB |
5 | * Copyright (c) 2005-2007, Wind River Systems | 5 | * Copyright (c) 2005-2007, 2012-2013, Wind River Systems |
6 | * All rights reserved. | 6 | * All rights reserved. |
7 | * | 7 | * |
8 | * Redistribution and use in source and binary forms, with or without | 8 | * Redistribution and use in source and binary forms, with or without |
@@ -37,10 +37,14 @@ | |||
37 | #ifndef _TIPC_SUBSCR_H | 37 | #ifndef _TIPC_SUBSCR_H |
38 | #define _TIPC_SUBSCR_H | 38 | #define _TIPC_SUBSCR_H |
39 | 39 | ||
40 | #include "server.h" | ||
41 | |||
40 | struct tipc_subscription; | 42 | struct tipc_subscription; |
43 | struct tipc_subscriber; | ||
41 | 44 | ||
42 | /** | 45 | /** |
43 | * struct tipc_subscription - TIPC network topology subscription object | 46 | * struct tipc_subscription - TIPC network topology subscription object |
47 | * @subscriber: pointer to its subscriber | ||
44 | * @seq: name sequence associated with subscription | 48 | * @seq: name sequence associated with subscription |
45 | * @timeout: duration of subscription (in ms) | 49 | * @timeout: duration of subscription (in ms) |
46 | * @filter: event filtering to be done for subscription | 50 | * @filter: event filtering to be done for subscription |
@@ -52,13 +56,13 @@ struct tipc_subscription; | |||
52 | * @evt: template for events generated by subscription | 56 | * @evt: template for events generated by subscription |
53 | */ | 57 | */ |
54 | struct tipc_subscription { | 58 | struct tipc_subscription { |
59 | struct tipc_subscriber *subscriber; | ||
55 | struct tipc_name_seq seq; | 60 | struct tipc_name_seq seq; |
56 | u32 timeout; | 61 | u32 timeout; |
57 | u32 filter; | 62 | u32 filter; |
58 | struct timer_list timer; | 63 | struct timer_list timer; |
59 | struct list_head nameseq_list; | 64 | struct list_head nameseq_list; |
60 | struct list_head subscription_list; | 65 | struct list_head subscription_list; |
61 | u32 server_ref; | ||
62 | int swap; | 66 | int swap; |
63 | struct tipc_event evt; | 67 | struct tipc_event evt; |
64 | }; | 68 | }; |