summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorBrian Haley <brian.haley@hp.com>2010-02-04 13:36:50 -0800
committerDavid S. Miller <davem@davemloft.net>2010-02-04 13:36:50 -0800
commitb0f83b280fcfa9cdd66b748f0c12fb26ce69e391 (patch)
tree620532b58fef2447609b22f1c9d36426cdf09f0d /Documentation
parent15c052fc7f4a1b3544602be8af77e31bba9261bf (diff)
downloadlinux-stable-b0f83b280fcfa9cdd66b748f0c12fb26ce69e391.tar.gz
linux-stable-b0f83b280fcfa9cdd66b748f0c12fb26ce69e391.tar.bz2
linux-stable-b0f83b280fcfa9cdd66b748f0c12fb26ce69e391.zip
doc: document IPv6 parameters
Update documentation to describe IPv6 parameters. Reported by <greg@enjellic.com>. Signed-off-by: Brian Haley <brian.haley@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 736d45602886..3ca7f8f56525 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -54,6 +54,7 @@ parameter is applicable:
IMA Integrity measurement architecture is enabled.
IOSCHED More than one I/O scheduler is enabled.
IP_PNP IP DHCP, BOOTP, or RARP is enabled.
+ IPV6 IPv6 support is enabled.
ISAPNP ISA PnP code is enabled.
ISDN Appropriate ISDN support is enabled.
JOY Appropriate joystick support is enabled.
@@ -347,6 +348,9 @@ and is between 256 and 4096 characters. It is defined in the file
Change the amount of debugging information output
when initialising the APIC and IO-APIC components.
+ autoconf= [IPV6]
+ See Documentation/networking/ipv6.txt.
+
show_lapic= [APIC,X86] Advanced Programmable Interrupt Controller
Limit apic dumping. The parameter defines the maximal
number of local apics being dumped. Also it is possible
@@ -629,6 +633,12 @@ and is between 256 and 4096 characters. It is defined in the file
See drivers/char/README.epca and
Documentation/serial/digiepca.txt.
+ disable= [IPV6]
+ See Documentation/networking/ipv6.txt.
+
+ disable_ipv6= [IPV6]
+ See Documentation/networking/ipv6.txt.
+
disable_mtrr_cleanup [X86]
The kernel tries to adjust MTRR layout from continuous
to discrete, to make X server driver able to add WB