s/get_interface/interface_get/

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index c448e4d..a2527ca 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -91,19 +91,19 @@ static void
 mark_interface_down(struct interface *iface)
 {
        interface_del_ctx_addr(iface, NULL);
-       release_device(iface->main_dev.dev);
+       device_release(iface->main_dev.dev);
        iface->state = IFS_DOWN;
 }
 
 static int
-__set_interface_up(struct interface *iface)
+__interface_set_up(struct interface *iface)
 {
        int ret;
 
        if (iface->state != IFS_DOWN)
                return 0;
 
-       ret = claim_device(iface->main_dev.dev);
+       ret = device_claim(iface->main_dev.dev);
        if (ret)
                return ret;
 
@@ -119,7 +119,7 @@ __set_interface_up(struct interface *iface)
 }
 
 static void
-__set_interface_down(struct interface *iface, bool force)
+__interface_set_down(struct interface *iface, bool force)
 {
        clear_interface_errors(iface);
 
@@ -159,9 +159,9 @@ interface_cb(struct device_user *dep, enum device_event ev)
 
        if (new_state) {
                if (iface->autostart && !config_init)
-                       set_interface_up(iface);
+                       interface_set_up(iface);
        } else
-               __set_interface_down(iface, true);
+               __interface_set_down(iface, true);
 }
 
 static void
@@ -210,7 +210,7 @@ alloc_interface(const char *name, struct uci_section *s, struct blob_attr *attr)
        struct blob_attr *cur;
        struct device *dev;
 
-       iface = get_interface(name);
+       iface = interface_get(name);
        if (iface)
                return iface;
 
@@ -236,9 +236,9 @@ alloc_interface(const char *name, struct uci_section *s, struct blob_attr *attr)
        }
 
        if ((cur = tb[IFACE_ATTR_IFNAME])) {
-               dev = get_device(blobmsg_data(cur), true);
+               dev = device_get(blobmsg_data(cur), true);
                if (dev)
-                       add_device_user(&iface->main_dev, dev);
+                       device_add_user(&iface->main_dev, dev);
        }
 
        return iface;
@@ -255,7 +255,7 @@ free_interface(struct interface *iface)
 }
 
 struct interface *
-get_interface(const char *name)
+interface_get(const char *name)
 {
        struct interface *iface;
 
@@ -276,7 +276,7 @@ interface_remove_link(struct interface *iface, struct device *dev)
                return;
        }
 
-       remove_device_user(&iface->main_dev);
+       device_remove_user(&iface->main_dev);
 }
 
 int
@@ -290,13 +290,13 @@ interface_add_link(struct interface *iface, struct device *dev)
        if (iface->main_dev.dev)
                interface_remove_link(iface, NULL);
 
-       add_device_user(&iface->main_dev, dev);
+       device_add_user(&iface->main_dev, dev);
 
        return 0;
 }
 
 int
-set_interface_up(struct interface *iface)
+interface_set_up(struct interface *iface)
 {
        iface->autostart = true;
 
@@ -308,25 +308,25 @@ set_interface_up(struct interface *iface)
        if (iface->state != IFS_DOWN)
                return 0;
 
-       return __set_interface_up(iface);
+       return __interface_set_up(iface);
 }
 
 int
-set_interface_down(struct interface *iface)
+interface_set_down(struct interface *iface)
 {
        iface->autostart = false;
-       __set_interface_down(iface, false);
+       __interface_set_down(iface, false);
 
        return 0;
 }
 
 void
-start_pending_interfaces(void)
+interface_start_pending(void)
 {
        struct interface *iface;
 
        list_for_each_entry(iface, &interfaces, list) {
                if (iface->active && iface->autostart)
-                       set_interface_up(iface);
+                       interface_set_up(iface);
        }
 }