git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
net
/
tipc
/
cluster.c
diff --git
a/net/tipc/cluster.c
b/net/tipc/cluster.c
index
1aed815
..
ab974ca
100644
(file)
--- a/
net/tipc/cluster.c
+++ b/
net/tipc/cluster.c
@@
-44,11
+44,11
@@
#include "msg.h"
#include "bearer.h"
#include "msg.h"
#include "bearer.h"
-static void tipc_cltr_multicast(struct cluster *c_ptr, struct sk_buff *buf,
-
u32 lower, u32 upper);
-st
atic st
ruct sk_buff *tipc_cltr_prepare_routing_msg(u32 data_size, u32 dest);
+void tipc_cltr_multicast(struct cluster *c_ptr, struct sk_buff *buf,
+ u32 lower, u32 upper);
+struct sk_buff *tipc_cltr_prepare_routing_msg(u32 data_size, u32 dest);
-struct node **tipc_local_nodes =
NULL
;
+struct node **tipc_local_nodes =
0
;
struct node_map tipc_cltr_bcast_nodes = {0,{0,}};
u32 tipc_highest_allowed_slave = 0;
struct node_map tipc_cltr_bcast_nodes = {0,{0,}};
u32 tipc_highest_allowed_slave = 0;
@@
-61,7
+61,7
@@
struct cluster *tipc_cltr_create(u32 addr)
c_ptr = (struct cluster *)kmalloc(sizeof(*c_ptr), GFP_ATOMIC);
if (c_ptr == NULL)
c_ptr = (struct cluster *)kmalloc(sizeof(*c_ptr), GFP_ATOMIC);
if (c_ptr == NULL)
- return
NULL
;
+ return
0
;
memset(c_ptr, 0, sizeof(*c_ptr));
c_ptr->addr = tipc_addr(tipc_zone(addr), tipc_cluster(addr), 0);
memset(c_ptr, 0, sizeof(*c_ptr));
c_ptr->addr = tipc_addr(tipc_zone(addr), tipc_cluster(addr), 0);
@@
-73,7
+73,7
@@
struct cluster *tipc_cltr_create(u32 addr)
c_ptr->nodes = (struct node **)kmalloc(alloc, GFP_ATOMIC);
if (c_ptr->nodes == NULL) {
kfree(c_ptr);
c_ptr->nodes = (struct node **)kmalloc(alloc, GFP_ATOMIC);
if (c_ptr->nodes == NULL) {
kfree(c_ptr);
- return
NULL
;
+ return
0
;
}
memset(c_ptr->nodes, 0, alloc);
if (in_own_cluster(addr))
}
memset(c_ptr->nodes, 0, alloc);
if (in_own_cluster(addr))
@@
-91,7
+91,7
@@
struct cluster *tipc_cltr_create(u32 addr)
}
else {
kfree(c_ptr);
}
else {
kfree(c_ptr);
- c_ptr =
NULL
;
+ c_ptr =
0
;
}
return c_ptr;
}
return c_ptr;
@@
-204,7
+204,7
@@
struct node *tipc_cltr_select_node(struct cluster *c_ptr, u32 selector)
assert(!in_own_cluster(c_ptr->addr));
if (!c_ptr->highest_node)
assert(!in_own_cluster(c_ptr->addr));
if (!c_ptr->highest_node)
- return
NULL
;
+ return
0
;
/* Start entry must be random */
while (mask > c_ptr->highest_node) {
/* Start entry must be random */
while (mask > c_ptr->highest_node) {
@@
-222,14
+222,14
@@
struct node *tipc_cltr_select_node(struct cluster *c_ptr, u32 selector)
if (tipc_node_has_active_links(c_ptr->nodes[n_num]))
return c_ptr->nodes[n_num];
}
if (tipc_node_has_active_links(c_ptr->nodes[n_num]))
return c_ptr->nodes[n_num];
}
- return
NULL
;
+ return
0
;
}
/*
* Routing table management: See description in node.c
*/
}
/*
* Routing table management: See description in node.c
*/
-st
atic st
ruct sk_buff *tipc_cltr_prepare_routing_msg(u32 data_size, u32 dest)
+struct sk_buff *tipc_cltr_prepare_routing_msg(u32 data_size, u32 dest)
{
u32 size = INT_H_SIZE + data_size;
struct sk_buff *buf = buf_acquire(size);
{
u32 size = INT_H_SIZE + data_size;
struct sk_buff *buf = buf_acquire(size);
@@
-495,7
+495,7
@@
void tipc_cltr_remove_as_router(struct cluster *c_ptr, u32 router)
* tipc_cltr_multicast - multicast message to local nodes
*/
* tipc_cltr_multicast - multicast message to local nodes
*/
-static void tipc_cltr_multicast(struct cluster *c_ptr, struct sk_buff *buf,
+void tipc_cltr_multicast(struct cluster *c_ptr, struct sk_buff *buf,
u32 lower, u32 upper)
{
struct sk_buff *buf_copy;
u32 lower, u32 upper)
{
struct sk_buff *buf_copy;