Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/netifrc:master commit in: doc/
Date: Wed, 28 Aug 2013 16:47:07
Message-Id: 1377708357.f144b97303313f913cee7e91f11648066a61c619.robbat2@OpenRC
1 commit: f144b97303313f913cee7e91f11648066a61c619
2 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 28 16:45:57 2013 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 28 16:45:57 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=f144b973
7
8 bonding: update example
9
10 Document per Kernel bonding.txt that some parameters are mutually
11 exclusive, eg miimon & arp_*.
12
13 Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
14 X-Gentoo-Bug: 468964
15
16 ---
17 doc/net.example.Linux.in | 4 +++-
18 1 file changed, 3 insertions(+), 1 deletion(-)
19
20 diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in
21 index e838f28..ddfe5e0 100644
22 --- a/doc/net.example.Linux.in
23 +++ b/doc/net.example.Linux.in
24 @@ -651,7 +651,9 @@
25 # You can also configure the parameters of the bond here, which must be done
26 # via sysfs on 2.6 kernels or newer. The description of all the options can be
27 # found in the kernel: /usr/src/linux-*/Documentation/networking/bonding.txt
28 -# You will probably want the 'mode' option at the least.
29 +# You will probably want the 'mode' option at the least. Please beware that
30 +# some options are mutually exclusive, eg miimon & arp_*; again, see the kernel
31 +# documentation for more info.
32 # Some possible parameters: mode fail_over_mac arp_validate arp_interval
33 # arp_ip_target downdelay updelay lacp_rate ad_select xmit_hash_policy
34 # num_grat_arp num_unsol_na miimon primary primary_reselect use_carrier