summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorDebabrata Banerjee <dbanerje@akamai.com>2018-05-14 14:48:10 -0400
committerDavid S. Miller <davem@davemloft.net>2018-05-16 12:15:11 -0400
commit1386c36b30388f46a95100924bfcae75160db715 (patch)
treedb9d63a1cb1d8afe910fc0bbf24ad16dd3fdf887 /Documentation
parente79c1055749e3183a2beee04a24da378623329c5 (diff)
downloadlinux-stable-1386c36b30388f46a95100924bfcae75160db715.tar.gz
linux-stable-1386c36b30388f46a95100924bfcae75160db715.tar.bz2
linux-stable-1386c36b30388f46a95100924bfcae75160db715.zip
bonding: allow carrier and link status to determine link state
In a mixed environment it may be difficult to tell if your hardware support carrier, if it does not it can always report true. With a new use_carrier option of 2, we can check both carrier and link status sequentially, instead of one or the other Signed-off-by: Debabrata Banerjee <dbanerje@akamai.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/networking/bonding.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt
index c13214d073a4..86d07fbb592d 100644
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
@@ -828,8 +828,8 @@ use_carrier
MII / ETHTOOL ioctl method to determine the link state.
A value of 1 enables the use of netif_carrier_ok(), a value of
- 0 will use the deprecated MII / ETHTOOL ioctls. The default
- value is 1.
+ 0 will use the deprecated MII / ETHTOOL ioctls. A value of 2
+ will check both. The default value is 1.
xmit_hash_policy