projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://oss.sgi.com/oss/git/xfs/xfs into for-linus
[linux-2.6-block.git]
/
net
/
tipc
/
addr.c
diff --git
a/net/tipc/addr.c
b/net/tipc/addr.c
index eca22260c98c59d79c6494b7094a514a011339f2..e5207a11edf64d36fd4a44bc8e9212425b1bf57f 100644
(file)
--- a/
net/tipc/addr.c
+++ b/
net/tipc/addr.c
@@
-1,6
+1,6
@@
/*
* net/tipc/addr.c: TIPC address utility routines
/*
* net/tipc/addr.c: TIPC address utility routines
- *
+ *
* Copyright (c) 2000-2006, Ericsson AB
* Copyright (c) 2004-2005, Wind River Systems
* All rights reserved.
* Copyright (c) 2000-2006, Ericsson AB
* Copyright (c) 2004-2005, Wind River Systems
* All rights reserved.
@@
-47,15
+47,15
@@
u32 tipc_get_addr(void)
}
/**
}
/**
- * addr_domain_valid - validates a network domain address
- *
- * Accepts <Z.C.N>, <Z.C.0>, <Z.0.0>, and <0.0.0>,
+ *
tipc_
addr_domain_valid - validates a network domain address
+ *
+ * Accepts <Z.C.N>, <Z.C.0>, <Z.0.0>, and <0.0.0>,
* where Z, C, and N are non-zero and do not exceed the configured limits.
* where Z, C, and N are non-zero and do not exceed the configured limits.
- *
+ *
* Returns 1 if domain address is valid, otherwise 0
*/
* Returns 1 if domain address is valid, otherwise 0
*/
-int addr_domain_valid(u32 addr)
+int
tipc_
addr_domain_valid(u32 addr)
{
u32 n = tipc_node(addr);
u32 c = tipc_cluster(addr);
{
u32 n = tipc_node(addr);
u32 c = tipc_cluster(addr);
@@
-79,16
+79,16
@@
int addr_domain_valid(u32 addr)
}
/**
}
/**
- * addr_node_valid - validates a proposed network address for this node
- *
- * Accepts <Z.C.N>, where Z, C, and N are non-zero and do not exceed
+ *
tipc_
addr_node_valid - validates a proposed network address for this node
+ *
+ * Accepts <Z.C.N>, where Z, C, and N are non-zero and do not exceed
* the configured limits.
* the configured limits.
- *
+ *
* Returns 1 if address can be used, otherwise 0
*/
* Returns 1 if address can be used, otherwise 0
*/
-int addr_node_valid(u32 addr)
+int
tipc_
addr_node_valid(u32 addr)
{
{
- return (addr_domain_valid(addr) && tipc_node(addr));
+ return (
tipc_
addr_domain_valid(addr) && tipc_node(addr));
}
}