tipc: delete TIPC_ADVANCED Kconfig variable

There used to be a time when TIPC had lots of Kconfig knobs the
end user could alter, but they have all been made automatic or
obsolete, with the exception of CONFIG_TIPC_PORTS.  This
previously existing set of options was all hidden under the
TIPC_ADVANCED setting, which does not exist in any code, but
only in Kconfig scope.

Having this now, just to hide the one remaining "advanced"
option no longer makes sense.  Remove it.  Also get rid of the
ifdeffery in the TIPC code that allowed for TIPC_PORTS to be
possibly undefined.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

diff --git a/net/tipc/Kconfig b/net/tipc/Kconfig
index 585460180ffb22df0ac0ae966ecc49cf87dcb8cc..bc41bd31eadc064a112fddb3066a9ee9d3405b9d 100644 (file)
--- a/net/tipc/Kconfig
+++ b/net/tipc/Kconfig
@@ -20,18 +20,9 @@ menuconfig TIPC
 
          If in doubt, say N.
 
-if TIPC
-
-config TIPC_ADVANCED
-       bool "Advanced TIPC configuration"
-       default n
-       help
-         Saying Y here will open some advanced configuration for TIPC.
-         Most users do not need to bother; if unsure, just say N.
-
 config TIPC_PORTS
        int "Maximum number of ports in a node"
-       depends on TIPC_ADVANCED
+       depends on TIPC
        range 127 65535
        default "8191"
        help
@@ -40,5 +31,3 @@ config TIPC_PORTS
 
          Setting this to a smaller value saves some memory,
          setting it to higher allows for more ports.
-
-endif # TIPC

diff --git a/net/tipc/core.c b/net/tipc/core.c
index bfe8af88469a95b5012d1cb34e3e9415120a2808..fc05cecd7481652dd57431727dc2355d39627859 100644 (file)
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -42,11 +42,6 @@
 
 #include <linux/module.h>
 
-#ifndef CONFIG_TIPC_PORTS
-#define CONFIG_TIPC_PORTS 8191
-#endif
-
-
 /* global variables used by multiple sub-systems within TIPC */
 int tipc_random __read_mostly;