diff options
Diffstat (limited to 'net/tipc/net.c')
| -rw-r--r-- | net/tipc/net.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c index f25b1cdb64eb..f61b7694138b 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c | |||
| @@ -116,7 +116,7 @@ | |||
| 116 | */ | 116 | */ |
| 117 | 117 | ||
| 118 | DEFINE_RWLOCK(tipc_net_lock); | 118 | DEFINE_RWLOCK(tipc_net_lock); |
| 119 | struct _zone *tipc_zones[256] = { NULL, }; | 119 | static struct _zone *tipc_zones[256] = { NULL, }; |
| 120 | struct network tipc_net = { tipc_zones }; | 120 | struct network tipc_net = { tipc_zones }; |
| 121 | 121 | ||
| 122 | struct tipc_node *tipc_net_select_remote_node(u32 addr, u32 ref) | 122 | struct tipc_node *tipc_net_select_remote_node(u32 addr, u32 ref) |
| @@ -219,7 +219,7 @@ void tipc_net_route_msg(struct sk_buff *buf) | |||
| 219 | 219 | ||
| 220 | /* Handle message for this node */ | 220 | /* Handle message for this node */ |
| 221 | dnode = msg_short(msg) ? tipc_own_addr : msg_destnode(msg); | 221 | dnode = msg_short(msg) ? tipc_own_addr : msg_destnode(msg); |
| 222 | if (in_scope(dnode, tipc_own_addr)) { | 222 | if (tipc_in_scope(dnode, tipc_own_addr)) { |
| 223 | if (msg_isdata(msg)) { | 223 | if (msg_isdata(msg)) { |
| 224 | if (msg_mcast(msg)) | 224 | if (msg_mcast(msg)) |
| 225 | tipc_port_recv_mcast(buf, NULL); | 225 | tipc_port_recv_mcast(buf, NULL); |
| @@ -277,7 +277,7 @@ int tipc_net_start(u32 addr) | |||
| 277 | 277 | ||
| 278 | info("Started in network mode\n"); | 278 | info("Started in network mode\n"); |
| 279 | info("Own node address %s, network identity %u\n", | 279 | info("Own node address %s, network identity %u\n", |
| 280 | addr_string_fill(addr_string, tipc_own_addr), tipc_net_id); | 280 | tipc_addr_string_fill(addr_string, tipc_own_addr), tipc_net_id); |
| 281 | return 0; | 281 | return 0; |
| 282 | } | 282 | } |
| 283 | 283 | ||
| @@ -291,6 +291,6 @@ void tipc_net_stop(void) | |||
| 291 | tipc_bclink_stop(); | 291 | tipc_bclink_stop(); |
| 292 | net_stop(); | 292 | net_stop(); |
| 293 | write_unlock_bh(&tipc_net_lock); | 293 | write_unlock_bh(&tipc_net_lock); |
| 294 | info("Left network mode \n"); | 294 | info("Left network mode\n"); |
| 295 | } | 295 | } |
| 296 | 296 | ||
