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
/
node.c
diff --git
a/net/tipc/node.c
b/net/tipc/node.c
index
0d5db06
..
6d65010
100644
(file)
--- a/
net/tipc/node.c
+++ b/
net/tipc/node.c
@@
-155,7
+155,7
@@
static void node_select_active_links(struct node *n_ptr)
u32 i;
u32 highest_prio = 0;
u32 i;
u32 highest_prio = 0;
- active[0] = active[1] =
NULL
;
+ active[0] = active[1] =
0
;
for (i = 0; i < MAX_BEARERS; i++) {
struct link *l_ptr = n_ptr->links[i];
for (i = 0; i < MAX_BEARERS; i++) {
struct link *l_ptr = n_ptr->links[i];
@@
-214,7
+214,7
@@
int tipc_node_has_redundant_links(struct node *n_ptr)
(n_ptr->active_links[0] != n_ptr->active_links[1]));
}
(n_ptr->active_links[0] != n_ptr->active_links[1]));
}
-
static
int tipc_node_has_active_routes(struct node *n_ptr)
+int tipc_node_has_active_routes(struct node *n_ptr)
{
return (n_ptr && (n_ptr->last_router >= 0));
}
{
return (n_ptr && (n_ptr->last_router >= 0));
}
@@
-240,7
+240,7
@@
struct node *tipc_node_attach_link(struct link *l_ptr)
err("Attempt to create third link to %s\n",
addr_string_fill(addr_string, n_ptr->addr));
err("Attempt to create third link to %s\n",
addr_string_fill(addr_string, n_ptr->addr));
- return
NULL
;
+ return
0
;
}
if (!n_ptr->links[bearer_id]) {
}
if (!n_ptr->links[bearer_id]) {
@@
-253,12
+253,12
@@
struct node *tipc_node_attach_link(struct link *l_ptr)
l_ptr->b_ptr->publ.name,
addr_string_fill(addr_string, l_ptr->addr));
}
l_ptr->b_ptr->publ.name,
addr_string_fill(addr_string, l_ptr->addr));
}
- return
NULL
;
+ return
0
;
}
void tipc_node_detach_link(struct node *n_ptr, struct link *l_ptr)
{
}
void tipc_node_detach_link(struct node *n_ptr, struct link *l_ptr)
{
- n_ptr->links[l_ptr->b_ptr->identity] =
NULL
;
+ n_ptr->links[l_ptr->b_ptr->identity] =
0
;
tipc_net.zones[tipc_zone(l_ptr->addr)]->links--;
n_ptr->link_cnt--;
}
tipc_net.zones[tipc_zone(l_ptr->addr)]->links--;
n_ptr->link_cnt--;
}
@@
-424,7
+424,7
@@
static void node_lost_contact(struct node *n_ptr)
/* Notify subscribers */
list_for_each_entry_safe(ns, tns, &n_ptr->nsub, nodesub_list) {
/* Notify subscribers */
list_for_each_entry_safe(ns, tns, &n_ptr->nsub, nodesub_list) {
- ns->node =
NULL
;
+ ns->node =
0
;
list_del_init(&ns->nodesub_list);
tipc_k_signal((Handler)ns->handle_node_down,
(unsigned long)ns->usr_handle);
list_del_init(&ns->nodesub_list);
tipc_k_signal((Handler)ns->handle_node_down,
(unsigned long)ns->usr_handle);
@@
-443,7
+443,7
@@
struct node *tipc_node_select_next_hop(u32 addr, u32 selector)
u32 router_addr;
if (!tipc_addr_domain_valid(addr))
u32 router_addr;
if (!tipc_addr_domain_valid(addr))
- return
NULL
;
+ return
0
;
/* Look for direct link to destination processsor */
n_ptr = tipc_node_find(addr);
/* Look for direct link to destination processsor */
n_ptr = tipc_node_find(addr);
@@
-452,7
+452,7
@@
struct node *tipc_node_select_next_hop(u32 addr, u32 selector)
/* Cluster local system nodes *must* have direct links */
if (!is_slave(addr) && in_own_cluster(addr))
/* Cluster local system nodes *must* have direct links */
if (!is_slave(addr) && in_own_cluster(addr))
- return
NULL
;
+ return
0
;
/* Look for cluster local router with direct link to node */
router_addr = tipc_node_select_router(n_ptr, selector);
/* Look for cluster local router with direct link to node */
router_addr = tipc_node_select_router(n_ptr, selector);
@@
-462,7
+462,7
@@
struct node *tipc_node_select_next_hop(u32 addr, u32 selector)
/* Slave nodes can only be accessed within own cluster via a
known router with direct link -- if no router was found,give up */
if (is_slave(addr))
/* Slave nodes can only be accessed within own cluster via a
known router with direct link -- if no router was found,give up */
if (is_slave(addr))
- return
NULL
;
+ return
0
;
/* Inter zone/cluster -- find any direct link to remote cluster */
addr = tipc_addr(tipc_zone(addr), tipc_cluster(addr), 0);
/* Inter zone/cluster -- find any direct link to remote cluster */
addr = tipc_addr(tipc_zone(addr), tipc_cluster(addr), 0);
@@
-475,7
+475,7
@@
struct node *tipc_node_select_next_hop(u32 addr, u32 selector)
if (router_addr)
return tipc_node_select(router_addr, selector);
if (router_addr)
return tipc_node_select(router_addr, selector);
- return
NULL
;
+ return
0
;
}
/**
}
/**