diff options
-rw-r--r-- | net/tipc/Kconfig | 13 | ||||
-rw-r--r-- | net/tipc/core.c | 5 |
2 files changed, 1 insertions, 17 deletions
diff --git a/net/tipc/Kconfig b/net/tipc/Kconfig index 585460180ffb..bc41bd31eadc 100644 --- a/net/tipc/Kconfig +++ b/net/tipc/Kconfig | |||
@@ -20,18 +20,9 @@ menuconfig TIPC | |||
20 | 20 | ||
21 | If in doubt, say N. | 21 | If in doubt, say N. |
22 | 22 | ||
23 | if TIPC | ||
24 | |||
25 | config TIPC_ADVANCED | ||
26 | bool "Advanced TIPC configuration" | ||
27 | default n | ||
28 | help | ||
29 | Saying Y here will open some advanced configuration for TIPC. | ||
30 | Most users do not need to bother; if unsure, just say N. | ||
31 | |||
32 | config TIPC_PORTS | 23 | config TIPC_PORTS |
33 | int "Maximum number of ports in a node" | 24 | int "Maximum number of ports in a node" |
34 | depends on TIPC_ADVANCED | 25 | depends on TIPC |
35 | range 127 65535 | 26 | range 127 65535 |
36 | default "8191" | 27 | default "8191" |
37 | help | 28 | help |
@@ -40,5 +31,3 @@ config TIPC_PORTS | |||
40 | 31 | ||
41 | Setting this to a smaller value saves some memory, | 32 | Setting this to a smaller value saves some memory, |
42 | setting it to higher allows for more ports. | 33 | setting it to higher allows for more ports. |
43 | |||
44 | endif # TIPC | ||
diff --git a/net/tipc/core.c b/net/tipc/core.c index bfe8af88469a..fc05cecd7481 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c | |||
@@ -42,11 +42,6 @@ | |||
42 | 42 | ||
43 | #include <linux/module.h> | 43 | #include <linux/module.h> |
44 | 44 | ||
45 | #ifndef CONFIG_TIPC_PORTS | ||
46 | #define CONFIG_TIPC_PORTS 8191 | ||
47 | #endif | ||
48 | |||
49 | |||
50 | /* global variables used by multiple sub-systems within TIPC */ | 45 | /* global variables used by multiple sub-systems within TIPC */ |
51 | int tipc_random __read_mostly; | 46 | int tipc_random __read_mostly; |
52 | 47 | ||