aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2010-01-19 17:23:57 -0500
committerDavid S. Miller <davem@davemloft.net>2010-01-19 17:23:57 -0500
commit7981d6f6b280d28779343cff4a88029fe53d1b47 (patch)
tree56d4a5b8993bb468dd7f644d6bb5ccf9c86ebadc /net/tipc
parent11380a4b2d86fae9a6bce75c9373668cc323fe57 (diff)
tipc: Clean up configuration file
This patch addresses a number of minor (mostly cosmetic) issues relating to the configuration of TIPC, including the following: - Corrects range limits for maximum number of ports per node - Adds missing range limits for size of log buffer - Removes configuration setting relating to unsupported slave node capability - Standardizes description and help text wording for configuration settings - Removes unneeded blank spaces Signed-off-by: Allan Stephens <allan.stephens@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/Kconfig73
1 files changed, 27 insertions, 46 deletions
diff --git a/net/tipc/Kconfig b/net/tipc/Kconfig
index dafbd533067c..b74f78d0c033 100644
--- a/net/tipc/Kconfig
+++ b/net/tipc/Kconfig
@@ -10,7 +10,7 @@ menuconfig TIPC
10 specially designed for intra cluster communication. This protocol 10 specially designed for intra cluster communication. This protocol
11 originates from Ericsson where it has been used in carrier grade 11 originates from Ericsson where it has been used in carrier grade
12 cluster applications for many years. 12 cluster applications for many years.
13 13
14 For more information about TIPC, see http://tipc.sourceforge.net. 14 For more information about TIPC, see http://tipc.sourceforge.net.
15 15
16 This protocol support is also available as a module ( = code which 16 This protocol support is also available as a module ( = code which
@@ -23,24 +23,23 @@ menuconfig TIPC
23if TIPC 23if TIPC
24 24
25config TIPC_ADVANCED 25config TIPC_ADVANCED
26 bool "TIPC: Advanced configuration" 26 bool "Advanced TIPC configuration"
27 default n 27 default n
28 help 28 help
29 Saying Y here will open some advanced configuration 29 Saying Y here will open some advanced configuration for TIPC.
30 for TIPC. Most users do not need to bother, so if 30 Most users do not need to bother; if unsure, just say N.
31 unsure, just say N.
32 31
33config TIPC_ZONES 32config TIPC_ZONES
34 int "Maximum number of zones in network" 33 int "Maximum number of zones in a network"
35 depends on TIPC_ADVANCED 34 depends on TIPC_ADVANCED
36 range 1 255 35 range 1 255
37 default "3" 36 default "3"
38 help 37 help
39 Max number of zones inside TIPC network. Max supported value 38 Specifies how many zones can be supported in a TIPC network.
40 is 255 zones, minimum is 1 39 Can range from 1 to 255 zones; default is 3.
41 40
42 Default is 3 zones in a network; setting this to higher 41 Setting this to a smaller value saves some memory;
43 allows more zones but might use more memory. 42 setting it to a higher value allows for more zones.
44 43
45config TIPC_CLUSTERS 44config TIPC_CLUSTERS
46 int "Maximum number of clusters in a zone" 45 int "Maximum number of clusters in a zone"
@@ -48,70 +47,52 @@ config TIPC_CLUSTERS
48 range 1 1 47 range 1 1
49 default "1" 48 default "1"
50 help 49 help
51 ***Only 1 (one cluster in a zone) is supported by current code.*** 50 Specifies how many clusters can be supported in a TIPC zone.
52
53 (Max number of clusters inside TIPC zone. Max supported
54 value is 4095 clusters, minimum is 1.
55 51
56 Default is 1; setting this to smaller value might save 52 *** Currently TIPC only supports a single cluster per zone. ***
57 some memory, setting it to higher
58 allows more clusters and might consume more memory.)
59 53
60config TIPC_NODES 54config TIPC_NODES
61 int "Maximum number of nodes in cluster" 55 int "Maximum number of nodes in a cluster"
62 depends on TIPC_ADVANCED 56 depends on TIPC_ADVANCED
63 range 8 2047 57 range 8 2047
64 default "255" 58 default "255"
65 help 59 help
66 Maximum number of nodes inside a TIPC cluster. Maximum 60 Specifies how many nodes can be supported in a TIPC cluster.
67 supported value is 2047 nodes, minimum is 8. 61 Can range from 8 to 2047 nodes; default is 255.
68
69 Setting this to a smaller value saves some memory,
70 setting it to higher allows more nodes.
71
72config TIPC_SLAVE_NODES
73 int "Maximum number of slave nodes in cluster"
74 depends on TIPC_ADVANCED
75 range 0 2047
76 default "0"
77 help
78 ***This capability is not supported by current code.***
79
80 Maximum number of slave nodes inside a TIPC cluster. Maximum
81 supported value is 2047 nodes, minimum is 0.
82 62
83 Setting this to a smaller value saves some memory, 63 Setting this to a smaller value saves some memory;
84 setting it to higher allows more nodes. 64 setting it to higher allows for more nodes.
85 65
86config TIPC_PORTS 66config TIPC_PORTS
87 int "Maximum number of ports in a node" 67 int "Maximum number of ports in a node"
88 depends on TIPC_ADVANCED 68 depends on TIPC_ADVANCED
89 range 217 65536 69 range 127 65535
90 default "8191" 70 default "8191"
91 help 71 help
92 Maximum number of ports within a node. Maximum 72 Specifies how many ports can be supported by a node.
93 supported value is 64535 nodes, minimum is 127. 73 Can range from 127 to 65535 ports; default is 8191.
94 74
95 Setting this to a smaller value saves some memory, 75 Setting this to a smaller value saves some memory,
96 setting it to higher allows more ports. 76 setting it to higher allows for more ports.
97 77
98config TIPC_LOG 78config TIPC_LOG
99 int "Size of log buffer" 79 int "Size of log buffer"
100 depends on TIPC_ADVANCED 80 depends on TIPC_ADVANCED
101 default 0 81 range 0 32768
82 default "0"
102 help 83 help
103 Size (in bytes) of TIPC's internal log buffer, which records the 84 Size (in bytes) of TIPC's internal log buffer, which records the
104 occurrence of significant events. Maximum supported value 85 occurrence of significant events. Can range from 0 to 32768 bytes;
105 is 32768 bytes, minimum is 0. 86 default is 0.
106 87
107 There is no need to enable the log buffer unless the node will be 88 There is no need to enable the log buffer unless the node will be
108 managed remotely via TIPC. 89 managed remotely via TIPC.
109 90
110config TIPC_DEBUG 91config TIPC_DEBUG
111 bool "Enable debugging support" 92 bool "Enable debug messages"
112 default n 93 default n
113 help 94 help
114 This will enable debugging of TIPC. 95 This enables debugging of TIPC.
115 96
116 Only say Y here if you are having trouble with TIPC. It will 97 Only say Y here if you are having trouble with TIPC. It will
117 enable the display of detailed information about what is going on. 98 enable the display of detailed information about what is going on.