s/init_device/device_init/

diff --git a/bridge.c b/bridge.c
index 3372d20..ad981da 100644 (file)
--- a/bridge.c
+++ b/bridge.c
@@ -329,7 +329,7 @@ bridge_create(const char *name, struct uci_section *s)
        if (!bst)
                return NULL;
 
        if (!bst)
                return NULL;
 

-       init_device(&bst->dev, &bridge_type, name);
+       device_init(&bst->dev, &bridge_type, name);

 
        bst->set_state = bst->dev.set_state;
        bst->dev.set_state = bridge_set_state;
 
        bst->set_state = bst->dev.set_state;
        bst->dev.set_state = bridge_set_state;

diff --git a/config.c b/config.c
index 0f7a652..4e98f60 100644 (file)
--- a/config.c
+++ b/config.c
@@ -118,7 +118,7 @@ config_parse_interface(struct uci_section *s)
 }
 
 void
 }
 
 void

-config_init_devices(void)
+config_device_inits(void)

 {
        struct uci_element *e;
 
 {
        struct uci_element *e;
 


@@ -154,7 +154,7 @@ config_init_interfaces(const char *name)
        uci_network = p;
        config_init = true;
 
        uci_network = p;
        config_init = true;
 

-       config_init_devices();
+       config_device_inits();

 
        uci_foreach_element(&p->sections, e) {
                struct uci_section *s = uci_to_section(e);
 
        uci_foreach_element(&p->sections, e) {
                struct uci_section *s = uci_to_section(e);

diff --git a/device.c b/device.c
index 3d787f9..2df4539 100644 (file)
--- a/device.c
+++ b/device.c
@@ -177,7 +177,7 @@ void init_virtual_device(struct device *dev, const struct device_type *type, con
        dev->type = type;
 }
 
        dev->type = type;
 }
 

-int init_device(struct device *dev, const struct device_type *type, const char *ifname)
+int device_init(struct device *dev, const struct device_type *type, const char *ifname)

 {
        int ret;
 
 {
        int ret;
 


@@ -218,7 +218,7 @@ struct device *device_get(const char *name, bool create)
                return NULL;
 
        dev = calloc(1, sizeof(*dev));
                return NULL;
 
        dev = calloc(1, sizeof(*dev));

-       init_device(dev, &simple_type, name);
+       device_init(dev, &simple_type, name);

 
        return dev;
 }
 
        return dev;
 }

diff --git a/device.h b/device.h
index 732ef02..d9b9012 100644 (file)
--- a/device.h
+++ b/device.h
@@ -130,7 +130,7 @@ extern const struct config_param_list device_attr_list;
 struct device *device_create(struct blob_attr *attr, struct uci_section *s);
 
 void init_virtual_device(struct device *dev, const struct device_type *type, const char *name);
 struct device *device_create(struct blob_attr *attr, struct uci_section *s);
 
 void init_virtual_device(struct device *dev, const struct device_type *type, const char *name);

-int init_device(struct device *iface, const struct device_type *type, const char *ifname);
+int device_init(struct device *iface, const struct device_type *type, const char *ifname);

 void device_cleanup(struct device *iface);
 struct device *device_get(const char *name, bool create);
 void device_add_user(struct device_user *dep, struct device *iface);
 void device_cleanup(struct device *iface);
 struct device *device_get(const char *name, bool create);
 void device_add_user(struct device_user *dep, struct device *iface);

diff --git a/vlan.c b/vlan.c
index 208ff73..4b79799 100644 (file)
--- a/vlan.c
+++ b/vlan.c
@@ -92,7 +92,7 @@ static struct device *get_vlan_device(struct device *dev, int id, bool create)
        vldev = calloc(1, sizeof(*vldev));
        snprintf(vldev->dev.ifname, IFNAMSIZ, "%s.%d", dev->ifname, id);
 
        vldev = calloc(1, sizeof(*vldev));
        snprintf(vldev->dev.ifname, IFNAMSIZ, "%s.%d", dev->ifname, id);
 

-       init_device(&vldev->dev, &vlan_type, NULL);
+       device_init(&vldev->dev, &vlan_type, NULL);

 
        vldev->set_state = vldev->dev.set_state;
        vldev->dev.set_state = vlan_set_device_state;
 
        vldev->set_state = vldev->dev.set_state;
        vldev->dev.set_state = vlan_set_device_state;