s/cleanup_device/device_cleanup/

[project/netifd.git] / bridge.c

diff --git a/bridge.c b/bridge.c
index 4ef98e6..aff41fb 100644 (file)
--- a/bridge.c
+++ b/bridge.c
@@ -81,7 +81,7 @@ bridge_member_cb(struct device_user *dev, enum device_event ev)
                if (bst->dev.active)
                        bridge_enable_member(bm);
                else if (bst->n_present == 1)
-                       set_device_present(&bst->dev, true);
+                       device_set_present(&bst->dev, true);
 
                break;
        case DEV_EVENT_REMOVE:
@@ -94,7 +94,7 @@ bridge_member_cb(struct device_user *dev, enum device_event ev)
                bm->present = false;
                bm->bst->n_present--;
                if (bst->n_present == 0)
-                       set_device_present(&bst->dev, false);
+                       device_set_present(&bst->dev, false);
 
                break;
        default:
@@ -136,7 +136,7 @@ bridge_set_up(struct bridge_state *bst)
        if (!bst->n_present) {
                /* initialization of all member interfaces failed */
                system_bridge_delbr(&bst->dev);
-               set_device_present(&bst->dev, false);
+               device_set_present(&bst->dev, false);
                return -ENOENT;
        }
 
@@ -169,7 +169,7 @@ bridge_create_member(struct bridge_state *bst, struct device *dev)
        bm = calloc(1, sizeof(*bm));
        bm->bst = bst;
        bm->dev.cb = bridge_member_cb;
-       add_device_user(&bm->dev, dev);
+       device_add_user(&bm->dev, dev);
 
        list_add(&bm->list, &bst->members);
 
@@ -357,6 +357,6 @@ interface_attach_bridge(struct interface *iface, struct uci_section *s)
        if (!dev)
                return -1;
 
-       add_device_user(&iface->main_dev, dev);
+       device_add_user(&iface->main_dev, dev);
        return 0;
 }