Pull esi-support into release branch

[linux-2.6] / net / tipc / subscr.h

diff --git a/net/tipc/subscr.h b/net/tipc/subscr.h
index 6b91ca9e2419192fa14eb74de500f7abe6818b69..1e5090465d2e3ba00756e37027967f916c0ee46e 100644 (file)
--- a/net/tipc/subscr.h
+++ b/net/tipc/subscr.h
@@ -1,9 +1,8 @@
 /*
  * net/tipc/subscr.h: Include file for TIPC subscription service
  * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
  * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -61,21 +60,21 @@ struct subscription {
        struct subscriber *owner;
 };
 
-int subscr_overlap(struct subscription * sub, 
-                  u32 found_lower, 
-                  u32 found_upper);
+int tipc_subscr_overlap(struct subscription * sub, 
+                       u32 found_lower, 
+                       u32 found_upper);
 
-void subscr_report_overlap(struct subscription * sub, 
-                          u32 found_lower, 
-                          u32 found_upper,
-                          u32 event, 
-                          u32 port_ref, 
-                          u32 node,
-                          int must_report);
+void tipc_subscr_report_overlap(struct subscription * sub, 
+                               u32 found_lower, 
+                               u32 found_upper,
+                               u32 event, 
+                               u32 port_ref, 
+                               u32 node,
+                               int must_report);
 
-int subscr_start(void);
+int tipc_subscr_start(void);
 
-void subscr_stop(void);
+void tipc_subscr_stop(void);
 
 
 #endif