diff options
| author | Debabrata Banerjee <dbanerje@akamai.com> | 2018-05-16 14:02:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-16 14:03:50 -0400 |
| commit | b3c898e20b1881b0876c3e811c58b039b37dd5fd (patch) | |
| tree | eae7dd71554f8e32e64337b3b62a98cd1255ebd1 /drivers/net/bonding/bond_options.c | |
| parent | 55df3e9754531060b07eb32a2ca5a981c0fd4b3d (diff) | |
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 'drivers/net/bonding/bond_options.c')
| -rw-r--r-- | drivers/net/bonding/bond_options.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c index dba6cef05134..8a945c9341d6 100644 --- a/drivers/net/bonding/bond_options.c +++ b/drivers/net/bonding/bond_options.c @@ -164,10 +164,9 @@ static const struct bond_opt_value bond_primary_reselect_tbl[] = { }; static const struct bond_opt_value bond_use_carrier_tbl[] = { - { "off", 0, 0}, - { "on", 1, BOND_VALFLAG_DEFAULT}, - { "both", 2, 0}, - { NULL, -1, 0} + { "off", 0, 0}, + { "on", 1, BOND_VALFLAG_DEFAULT}, + { NULL, -1, 0} }; static const struct bond_opt_value bond_all_slaves_active_tbl[] = { |