netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] doc: document IPv6 parameters
@ 2010-02-04 20:49 Brian Haley
  2010-02-04 21:37 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Brian Haley @ 2010-02-04 20:49 UTC (permalink / raw)
  To: David Miller; +Cc: netdev@vger.kernel.org, greg

Dave,

Can you take these in net-next-2.6?  I haven't heard boo from anyone on linux-doc or lkml.

-Brian


Update documentation to describe IPv6 parameters.
Reported by <greg@enjellic.com>.

Signed-off-by: Brian Haley <brian.haley@hp.com>
---

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 736d456..3ca7f8f 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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] doc: document IPv6 parameters
  2010-02-04 20:49 [PATCH] doc: document IPv6 parameters Brian Haley
@ 2010-02-04 21:37 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-02-04 21:37 UTC (permalink / raw)
  To: brian.haley; +Cc: netdev, greg

From: Brian Haley <brian.haley@hp.com>
Date: Thu, 04 Feb 2010 15:49:44 -0500

> Can you take these in net-next-2.6?  I haven't heard boo from anyone
> on linux-doc or lkml.

Sure, applied, thanks Brian.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-02-04 21:36 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-04 20:49 [PATCH] doc: document IPv6 parameters Brian Haley
2010-02-04 21:37 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).