Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[deliverable/linux.git] / drivers / net / bonding / bond_sysfs.c

diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index f4ae720862158354d028169de77cafe782f539fa..e23c3ed737deefc7d3ca200b545a6c4b590afc01 100644 (file)
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -42,7 +42,6 @@
 
 #include <net/bonding.h>
 
-#define to_dev(obj)    container_of(obj, struct device, kobj)
 #define to_bond(cd)    ((struct bonding *)(netdev_priv(to_net_dev(cd))))
 
 /* "show" function for the bond_masters attribute.
@@ -481,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");
 }