diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 12:05:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 12:05:25 -0400 |
| commit | e5dfa9282f3db461a896a6692b529e1823ba98c6 (patch) | |
| tree | 574d23cebc57c657373b0e1b6692c047aba8dd6e /Documentation | |
| parent | 5dd962494f76fb3ef1196cd420b5d6260d7a3766 (diff) | |
| parent | b2ab040db85835e54c7559533df7f85902617926 (diff) | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/networking/bonding.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt index a55f0f95b171..b0fe41da007b 100644 --- a/Documentation/networking/bonding.txt +++ b/Documentation/networking/bonding.txt | |||
| @@ -777,7 +777,7 @@ doing so is the same as described in the "Configuring Multiple Bonds | |||
| 777 | Manually" section, below. | 777 | Manually" section, below. |
| 778 | 778 | ||
| 779 | NOTE: It has been observed that some Red Hat supplied kernels | 779 | NOTE: It has been observed that some Red Hat supplied kernels |
| 780 | are apparently unable to rename modules at load time (the "-obonding1" | 780 | are apparently unable to rename modules at load time (the "-o bond1" |
| 781 | part). Attempts to pass that option to modprobe will produce an | 781 | part). Attempts to pass that option to modprobe will produce an |
| 782 | "Operation not permitted" error. This has been reported on some | 782 | "Operation not permitted" error. This has been reported on some |
| 783 | Fedora Core kernels, and has been seen on RHEL 4 as well. On kernels | 783 | Fedora Core kernels, and has been seen on RHEL 4 as well. On kernels |
| @@ -883,7 +883,8 @@ the above does not work, and the second bonding instance never sees | |||
| 883 | its options. In that case, the second options line can be substituted | 883 | its options. In that case, the second options line can be substituted |
| 884 | as follows: | 884 | as follows: |
| 885 | 885 | ||
| 886 | install bonding1 /sbin/modprobe bonding -obond1 mode=balance-alb miimon=50 | 886 | install bond1 /sbin/modprobe --ignore-install bonding -o bond1 \ |
| 887 | mode=balance-alb miimon=50 | ||
| 887 | 888 | ||
| 888 | This may be repeated any number of times, specifying a new and | 889 | This may be repeated any number of times, specifying a new and |
| 889 | unique name in place of bond1 for each subsequent instance. | 890 | unique name in place of bond1 for each subsequent instance. |