diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2006-01-18 17:23:54 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-18 17:23:54 -0500 |
commit | 27a7b0415f6e5c0ffdfb1ba42b9b96ddfbb78b8f (patch) | |
tree | 8107ee11c3fe7d3b4be36054af4475326af86d53 /net/tipc/addr.c | |
parent | ad12583f46bcb6ce93ccd99fa063c0d701146b2e (diff) | |
parent | 4323add67792ced172d0d93b8b2e6187023115f1 (diff) |
Merge git://tipc.cslab.ericsson.net/pub/git/tipc
Diffstat (limited to 'net/tipc/addr.c')
-rw-r--r-- | net/tipc/addr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/tipc/addr.c b/net/tipc/addr.c index eca22260c98c..0be25e175b93 100644 --- a/net/tipc/addr.c +++ b/net/tipc/addr.c | |||
@@ -47,7 +47,7 @@ u32 tipc_get_addr(void) | |||
47 | } | 47 | } |
48 | 48 | ||
49 | /** | 49 | /** |
50 | * addr_domain_valid - validates a network domain address | 50 | * tipc_addr_domain_valid - validates a network domain address |
51 | * | 51 | * |
52 | * Accepts <Z.C.N>, <Z.C.0>, <Z.0.0>, and <0.0.0>, | 52 | * Accepts <Z.C.N>, <Z.C.0>, <Z.0.0>, and <0.0.0>, |
53 | * where Z, C, and N are non-zero and do not exceed the configured limits. | 53 | * where Z, C, and N are non-zero and do not exceed the configured limits. |
@@ -55,7 +55,7 @@ u32 tipc_get_addr(void) | |||
55 | * Returns 1 if domain address is valid, otherwise 0 | 55 | * Returns 1 if domain address is valid, otherwise 0 |
56 | */ | 56 | */ |
57 | 57 | ||
58 | int addr_domain_valid(u32 addr) | 58 | int tipc_addr_domain_valid(u32 addr) |
59 | { | 59 | { |
60 | u32 n = tipc_node(addr); | 60 | u32 n = tipc_node(addr); |
61 | u32 c = tipc_cluster(addr); | 61 | u32 c = tipc_cluster(addr); |
@@ -79,7 +79,7 @@ int addr_domain_valid(u32 addr) | |||
79 | } | 79 | } |
80 | 80 | ||
81 | /** | 81 | /** |
82 | * addr_node_valid - validates a proposed network address for this node | 82 | * tipc_addr_node_valid - validates a proposed network address for this node |
83 | * | 83 | * |
84 | * Accepts <Z.C.N>, where Z, C, and N are non-zero and do not exceed | 84 | * Accepts <Z.C.N>, where Z, C, and N are non-zero and do not exceed |
85 | * the configured limits. | 85 | * the configured limits. |
@@ -87,8 +87,8 @@ int addr_domain_valid(u32 addr) | |||
87 | * Returns 1 if address can be used, otherwise 0 | 87 | * Returns 1 if address can be used, otherwise 0 |
88 | */ | 88 | */ |
89 | 89 | ||
90 | int addr_node_valid(u32 addr) | 90 | int tipc_addr_node_valid(u32 addr) |
91 | { | 91 | { |
92 | return (addr_domain_valid(addr) && tipc_node(addr)); | 92 | return (tipc_addr_domain_valid(addr) && tipc_node(addr)); |
93 | } | 93 | } |
94 | 94 | ||