summaryrefslogtreecommitdiffstats
path: root/net/tipc/subscr.h
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2011-12-29 20:43:44 -0500
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-12-29 21:53:29 -0500
commitfead39098badacbfb5890de9a10e5b265788a524 (patch)
tree98d6f26a9525a8289efc79d6bb5fc626ae890b42 /net/tipc/subscr.h
parent4584310b4a787c9b70e5507a8b5288ba32b0a909 (diff)
tipc: rename struct subscription to struct tipc_subscription
Make this rename so that it is consistent with the majority of the other tipc structs and to assist in removing any ambiguity with other similar names in other subsystems. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc/subscr.h')
-rw-r--r--net/tipc/subscr.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/tipc/subscr.h b/net/tipc/subscr.h
index 4b06ef6f8401..ef6529c8456f 100644
--- a/net/tipc/subscr.h
+++ b/net/tipc/subscr.h
@@ -37,10 +37,10 @@
37#ifndef _TIPC_SUBSCR_H 37#ifndef _TIPC_SUBSCR_H
38#define _TIPC_SUBSCR_H 38#define _TIPC_SUBSCR_H
39 39
40struct subscription; 40struct tipc_subscription;
41 41
42/** 42/**
43 * struct subscription - TIPC network topology subscription object 43 * struct tipc_subscription - TIPC network topology subscription object
44 * @seq: name sequence associated with subscription 44 * @seq: name sequence associated with subscription
45 * @timeout: duration of subscription (in ms) 45 * @timeout: duration of subscription (in ms)
46 * @filter: event filtering to be done for subscription 46 * @filter: event filtering to be done for subscription
@@ -52,7 +52,7 @@ struct subscription;
52 * @evt: template for events generated by subscription 52 * @evt: template for events generated by subscription
53 */ 53 */
54 54
55struct subscription { 55struct tipc_subscription {
56 struct tipc_name_seq seq; 56 struct tipc_name_seq seq;
57 u32 timeout; 57 u32 timeout;
58 u32 filter; 58 u32 filter;
@@ -64,11 +64,11 @@ struct subscription {
64 struct tipc_event evt; 64 struct tipc_event evt;
65}; 65};
66 66
67int tipc_subscr_overlap(struct subscription *sub, 67int tipc_subscr_overlap(struct tipc_subscription *sub,
68 u32 found_lower, 68 u32 found_lower,
69 u32 found_upper); 69 u32 found_upper);
70 70
71void tipc_subscr_report_overlap(struct subscription *sub, 71void tipc_subscr_report_overlap(struct tipc_subscription *sub,
72 u32 found_lower, 72 u32 found_lower,
73 u32 found_upper, 73 u32 found_upper,
74 u32 event, 74 u32 event,