diff options
Diffstat (limited to 'net/tipc/core.c')
| -rw-r--r-- | net/tipc/core.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/net/tipc/core.c b/net/tipc/core.c index f7b95239ebda..6586eac6a50e 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c | |||
| @@ -34,22 +34,18 @@ | |||
| 34 | * POSSIBILITY OF SUCH DAMAGE. | 34 | * POSSIBILITY OF SUCH DAMAGE. |
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | #include <linux/module.h> | ||
| 38 | |||
| 39 | #include "core.h" | 37 | #include "core.h" |
| 40 | #include "ref.h" | 38 | #include "ref.h" |
| 41 | #include "name_table.h" | 39 | #include "name_table.h" |
| 42 | #include "subscr.h" | 40 | #include "subscr.h" |
| 43 | #include "config.h" | 41 | #include "config.h" |
| 44 | 42 | ||
| 43 | #include <linux/module.h> | ||
| 45 | 44 | ||
| 46 | #ifndef CONFIG_TIPC_PORTS | 45 | #ifndef CONFIG_TIPC_PORTS |
| 47 | #define CONFIG_TIPC_PORTS 8191 | 46 | #define CONFIG_TIPC_PORTS 8191 |
| 48 | #endif | 47 | #endif |
| 49 | 48 | ||
| 50 | #ifndef CONFIG_TIPC_LOG | ||
| 51 | #define CONFIG_TIPC_LOG 0 | ||
| 52 | #endif | ||
| 53 | 49 | ||
| 54 | /* global variables used by multiple sub-systems within TIPC */ | 50 | /* global variables used by multiple sub-systems within TIPC */ |
| 55 | int tipc_random; | 51 | int tipc_random; |
| @@ -125,7 +121,6 @@ static void tipc_core_stop(void) | |||
| 125 | tipc_nametbl_stop(); | 121 | tipc_nametbl_stop(); |
| 126 | tipc_ref_table_stop(); | 122 | tipc_ref_table_stop(); |
| 127 | tipc_socket_stop(); | 123 | tipc_socket_stop(); |
| 128 | tipc_log_resize(0); | ||
| 129 | } | 124 | } |
| 130 | 125 | ||
| 131 | /** | 126 | /** |
| @@ -161,10 +156,7 @@ static int __init tipc_init(void) | |||
| 161 | { | 156 | { |
| 162 | int res; | 157 | int res; |
| 163 | 158 | ||
| 164 | if (tipc_log_resize(CONFIG_TIPC_LOG) != 0) | 159 | pr_info("Activated (version " TIPC_MOD_VER ")\n"); |
| 165 | warn("Unable to create log buffer\n"); | ||
| 166 | |||
| 167 | info("Activated (version " TIPC_MOD_VER ")\n"); | ||
| 168 | 160 | ||
| 169 | tipc_own_addr = 0; | 161 | tipc_own_addr = 0; |
| 170 | tipc_remote_management = 1; | 162 | tipc_remote_management = 1; |
| @@ -175,9 +167,9 @@ static int __init tipc_init(void) | |||
| 175 | 167 | ||
| 176 | res = tipc_core_start(); | 168 | res = tipc_core_start(); |
| 177 | if (res) | 169 | if (res) |
| 178 | err("Unable to start in single node mode\n"); | 170 | pr_err("Unable to start in single node mode\n"); |
| 179 | else | 171 | else |
| 180 | info("Started in single node mode\n"); | 172 | pr_info("Started in single node mode\n"); |
| 181 | return res; | 173 | return res; |
| 182 | } | 174 | } |
| 183 | 175 | ||
| @@ -185,7 +177,7 @@ static void __exit tipc_exit(void) | |||
| 185 | { | 177 | { |
| 186 | tipc_core_stop_net(); | 178 | tipc_core_stop_net(); |
| 187 | tipc_core_stop(); | 179 | tipc_core_stop(); |
| 188 | info("Deactivated\n"); | 180 | pr_info("Deactivated\n"); |
| 189 | } | 181 | } |
| 190 | 182 | ||
| 191 | module_init(tipc_init); | 183 | module_init(tipc_init); |
