diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-07-30 03:13:03 -0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-07-30 03:13:03 -0400 |
| commit | fcb06702f023a0e7b1e6ebf9746f34b610ca0508 (patch) | |
| tree | db022324c4978dd9af059be38822d23455a45f55 /net/tipc/net.c | |
| parent | 5e31fc0815a4e2c72b1b495fe7a0d8f9bfb9e4b4 (diff) | |
| parent | 9dbf5f55f8d35ff9aedc75267f4e4042aaf89755 (diff) | |
Merge remote-tracking branch 'wireless/master' into mac80211
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 7c236c89cf5e..5b5cea259caf 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c | |||
| @@ -184,9 +184,9 @@ int tipc_net_start(u32 addr) | |||
| 184 | 184 | ||
| 185 | tipc_cfg_reinit(); | 185 | tipc_cfg_reinit(); |
| 186 | 186 | ||
| 187 | info("Started in network mode\n"); | 187 | pr_info("Started in network mode\n"); |
| 188 | info("Own node address %s, network identity %u\n", | 188 | pr_info("Own node address %s, network identity %u\n", |
| 189 | tipc_addr_string_fill(addr_string, tipc_own_addr), tipc_net_id); | 189 | tipc_addr_string_fill(addr_string, tipc_own_addr), tipc_net_id); |
| 190 | return 0; | 190 | return 0; |
| 191 | } | 191 | } |
| 192 | 192 | ||
| @@ -202,5 +202,5 @@ void tipc_net_stop(void) | |||
| 202 | list_for_each_entry_safe(node, t_node, &tipc_node_list, list) | 202 | list_for_each_entry_safe(node, t_node, &tipc_node_list, list) |
| 203 | tipc_node_delete(node); | 203 | tipc_node_delete(node); |
| 204 | write_unlock_bh(&tipc_net_lock); | 204 | write_unlock_bh(&tipc_net_lock); |
| 205 | info("Left network mode\n"); | 205 | pr_info("Left network mode\n"); |
| 206 | } | 206 | } |