[Patch] bonding.txt documentation patch

[Mark Watts]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

diff -Nurd linux-2.6.9/Documentation/networking/bonding.txt 
linux-2.6.9-mrw/Documentation/networking/bonding.txt
- --- linux-2.6.9/Documentation/networking/bonding.txt    2004-10-18 
22:53:45.000000000 +0100
+++ linux-2.6.9-mrw/Documentation/networking/bonding.txt        2004-11-02 
09:48:05.831738136 +0000
@@ -418,17 +418,27 @@
 driver multiple times allows each instance of the driver to have differing
 options.

+Note: 2.6 kernel modules are capable of being loaded multiple times without
+being explicitly loaded twice. The bonding.o driver however, defaults to
+only allowing you to load it once, unless you use the max_bonds parameter.
+Using "-o bonding1" is depreciated for 2.6 kernels.
+
 For example, to configure two bonding interfaces, one with mii link
 monitoring performed every 100 milliseconds, and one with ARP link
- -monitoring performed every 200 milliseconds, the /etc/conf.modules should
+monitoring performed every 200 milliseconds, the /etc/modprobe.conf should
 resemble the following:

 alias bond0 bonding
 alias bond1 bonding

+# For Kernel 2.4 (/etc/modules.conf or conf.modules):
 options bond0 miimon=100
 options bond1 -o bonding1 arp_interval=200 arp_ip_target=10.0.0.1

+# for Kernel 2.6:
+options bond0 miimon=100 max_bonds=2
+options bond1 arp_interval=200 arp_ip_target=10.0.0.1
+
 Configuring Multiple ARP Targets
 ================================


- -- 
Mark Watts
Senior Systems Engineer
QinetiQ Trusted Information Management
Trusted Solutions and Services group
GPG Public Key ID: 455420ED

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFBh1gmBn4EFUVUIO0RAlU9AJ9KvQAODtingQYSIfRjorvsvlVmxQCgwnVr
JbiVbefW1TNxDl4aTBsGfGg=
=D8Gz
-----END PGP SIGNATURE-----
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/