X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=interface.c;h=c4ce9e9c618e3c94d0fa270c4f0a8cf70b8437ee;hb=49e68df7c8e99c66084612007d89c43d9ab2a975;hp=1f73130db4f8b764fc4eb86769eaf85223ab35c9;hpb=170304603e7d905e98301c703ad2ec107b9a774c;p=project%2Fnetifd.git

diff --git a/interface.c b/interface.c
index 1f73130..c4ce9e9 100644
--- a/interface.c
+++ b/interface.c
@@ -91,12 +91,12 @@ 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;
 
@@ -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;
 
@@ -245,7 +245,7 @@ alloc_interface(const char *name, struct uci_section *s, struct blob_attr *attr)
 }
 
 void
-free_interface(struct interface *iface)
+interface_free(struct interface *iface)
 {
 	netifd_ubus_remove_interface(iface);
 	list_del(&iface->list);
@@ -255,7 +255,7 @@ free_interface(struct interface *iface)
 }
 
 struct interface *
-get_interface(const char *name)
+interface_get(const char *name)
 {
 	struct interface *iface;
 
@@ -296,7 +296,7 @@ interface_add_link(struct interface *iface, struct device *dev)
 }
 
 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);
 	}
 }