summaryrefslogtreecommitdiffstats
path: root/Documentation/networking
diff options
context:
space:
mode:
authorDebabrata Banerjee <dbanerje@akamai.com>2018-05-16 14:02:13 -0400
committerDavid S. Miller <davem@davemloft.net>2018-05-16 14:03:50 -0400
commitb3c898e20b1881b0876c3e811c58b039b37dd5fd (patch)
treeeae7dd71554f8e32e64337b3b62a98cd1255ebd1 /Documentation/networking
parent55df3e9754531060b07eb32a2ca5a981c0fd4b3d (diff)
downloadlinux-b3c898e20b1881b0876c3e811c58b039b37dd5fd.tar.bz2
Revert "bonding: allow carrier and link status to determine link state"
This reverts commit 1386c36b30388f46a95100924bfcae75160db715. We don't want to encourage drivers to not report carrier status correctly, therefore remove this commit. Signed-off-by: Debabrata Banerjee <dbanerje@akamai.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/networking')
-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 86d07fbb592d..c13214d073a4 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. A value of 2
- will check both. The default value is 1.
+ 0 will use the deprecated MII / ETHTOOL ioctls. The default
+ value is 1.
xmit_hash_policy