diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-14 16:49:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-14 16:49:53 -0400 |
| commit | 201a11c1db82247143f0fbe29b4a97f16fa3a591 (patch) | |
| tree | 80be130504183e1e60ebd316985e6d5b7a3c3311 | |
| parent | 05aebe2e5d009314a1d9b47ad9cda59ccb57d76d (diff) | |
| parent | 1fa073803ec543e8b95fc5acf164fa2e0074bb4f (diff) | |
Merge branch 'tipc-Mar14-2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/net-next-2.6
| -rw-r--r-- | net/tipc/net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c index 8fbc7e6ae3df..68b3dd637291 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c | |||
| @@ -221,7 +221,7 @@ void tipc_net_stop(void) | |||
| 221 | tipc_bearer_stop(); | 221 | tipc_bearer_stop(); |
| 222 | tipc_mode = TIPC_NODE_MODE; | 222 | tipc_mode = TIPC_NODE_MODE; |
| 223 | tipc_bclink_stop(); | 223 | tipc_bclink_stop(); |
| 224 | list_for_each_entry_safe(node, t_node, &tipc_node_list, list); | 224 | list_for_each_entry_safe(node, t_node, &tipc_node_list, list) |
| 225 | tipc_node_delete(node); | 225 | tipc_node_delete(node); |
| 226 | write_unlock_bh(&tipc_net_lock); | 226 | write_unlock_bh(&tipc_net_lock); |
| 227 | info("Left network mode\n"); | 227 | info("Left network mode\n"); |