[PATCH] softmac: make non-operational after being stopped

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

diff --git a/net/tipc/zone.h b/net/tipc/zone.h
index 2fc5ed71b6dd4466e754804f5777326f51dc3a05..267999c5a240fb570fa9e52e4694b482b2e7f700 100644 (file)
--- a/net/tipc/zone.h
+++ b/net/tipc/zone.h
@@ -1,7 +1,7 @@
 /*
  * net/tipc/zone.h: Include file for TIPC zone management routines
  * 
- * Copyright (c) 2003-2006, Ericsson AB
+ * Copyright (c) 2000-2006, Ericsson AB
  * Copyright (c) 2005, Wind River Systems
  * All rights reserved.
  *
@@ -54,18 +54,18 @@ struct _zone {
        u32 links;
 };
 
-struct node *zone_select_remote_node(struct _zone *z_ptr, u32 addr, u32 ref);
-u32 zone_select_router(struct _zone *z_ptr, u32 addr, u32 ref);
-void zone_remove_as_router(struct _zone *z_ptr, u32 router);
-void zone_send_external_routes(struct _zone *z_ptr, u32 dest);
-struct _zone *zone_create(u32 addr);
-void zone_delete(struct _zone *z_ptr);
-void zone_attach_cluster(struct _zone *z_ptr, struct cluster *c_ptr);
-u32 zone_next_node(u32 addr);
+struct node *tipc_zone_select_remote_node(struct _zone *z_ptr, u32 addr, u32 ref);
+u32 tipc_zone_select_router(struct _zone *z_ptr, u32 addr, u32 ref);
+void tipc_zone_remove_as_router(struct _zone *z_ptr, u32 router);
+void tipc_zone_send_external_routes(struct _zone *z_ptr, u32 dest);
+struct _zone *tipc_zone_create(u32 addr);
+void tipc_zone_delete(struct _zone *z_ptr);
+void tipc_zone_attach_cluster(struct _zone *z_ptr, struct cluster *c_ptr);
+u32 tipc_zone_next_node(u32 addr);
 
-static inline struct _zone *zone_find(u32 addr)
+static inline struct _zone *tipc_zone_find(u32 addr)
 {
-       return net.zones[tipc_zone(addr)];
+       return tipc_net.zones[tipc_zone(addr)];
 }
 
 #endif