diff options
| author | Jarod Wilson <jarod@redhat.com> | 2016-01-09 02:35:36 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-11 23:14:42 +0100 |
| commit | c8086f6d88f02aa8c87a71dca75fe5392d7679f7 (patch) | |
| tree | 449d8d15094234f93672b7382f228361de76ce21 | |
| parent | net/rtnetlink: remove unused sz_idx variable (diff) | |
| download | linux-c8086f6d88f02aa8c87a71dca75fe5392d7679f7.tar.xz linux-c8086f6d88f02aa8c87a71dca75fe5392d7679f7.zip | |
bonding: make mii_status sysfs node consistent
The spew in /proc/net/bonding/bond0 uses netif_carrier_ok() to determine
mii_status, while /sys/class/net/bond0/bonding/mii_status looks at
curr_active_slave, which doesn't actually seem to be set sometimes when
the bond actually is up. A mode 4 bond configured via ifcfg-foo files on a
Red Hat Enterprise Linux system, after boot, comes up clean and
functional, but the sysfs node shows mii_status of down, while proc shows
up. A simple enough fix here seems to be to use the same method for
determining up or down in both places, and I'd opt for the one that seems
to match reality.
CC: Jay Vosburgh <j.vosburgh@gmail.com>
CC: Veaceslav Falico <vfalico@gmail.com>
CC: Andy Gospodarek <gospo@cumulusnetworks.com>
CC: netdev@vger.kernel.org
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/bonding/bond_sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index 313dbac207ee..e23c3ed737de 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c @@ -480,7 +480,7 @@ static ssize_t bonding_show_mii_status(struct device *d, char *buf) { struct bonding *bond = to_bond(d); - bool active = !!rcu_access_pointer(bond->curr_active_slave); + bool active = netif_carrier_ok(bond->dev); return sprintf(buf, "%s\n", active ? "up" : "down"); } |