1 files changed, 27 insertions, 0 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index f00dd45b0308..df85cec3e5d9 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -466,6 +466,22 @@ static void bond_update_speed_duplex(struct slave *slave)
         return;
 }
 
+const char *bond_slave_link_status(s8 link)
+{
+        switch (link) {
+        case BOND_LINK_UP:
+                return "up";
+        case BOND_LINK_FAIL:
+                return "going down";
+        case BOND_LINK_DOWN:
+                return "down";
+        case BOND_LINK_BACK:
+                return "going back";
+        default:
+                return "unknown";
+        }
+}
+
 /*
  * if <dev> supports MII link status reporting, check its link status.
  *
@@ -1576,6 +1592,12 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                 goto err_unregister;
         }
 
+        res = bond_sysfs_slave_add(new_slave);
+        if (res) {
+                pr_debug("Error %d calling bond_sysfs_slave_add\n", res);
+                goto err_upper_unlink;
+        }
+
         bond->slave_cnt++;
         bond_compute_features(bond);
         bond_set_carrier(bond);
@@ -1595,6 +1617,9 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
         return 0;
 
 /* Undo stages on error */
+err_upper_unlink:
+        bond_upper_dev_unlink(bond_dev, slave_dev);
+
 err_unregister:
         netdev_rx_handler_unregister(slave_dev);
 
@@ -1687,6 +1712,8 @@ static int __bond_release_one(struct net_device *bond_dev,
         /* release the slave from its bond */
         bond->slave_cnt--;
 
+        bond_sysfs_slave_del(slave);
+
         bond_upper_dev_unlink(bond_dev, slave_dev);
         /* unregister rx_handler early so bond_handle_frame wouldn't be called
          * for this slave anymore.