s/release_device/device_release/

diff --git a/bridge.c b/bridge.c
index d11f102..24f8069 100644 (file)
--- a/bridge.c
+++ b/bridge.c
@@ -35,7 +35,7 @@ bridge_disable_member(struct bridge_member *bm)
                return 0;
 
        system_bridge_delif(&bst->dev, bm->dev.dev);
                return 0;
 
        system_bridge_delif(&bst->dev, bm->dev.dev);

-       release_device(bm->dev.dev);
+       device_release(bm->dev.dev);

 
        return 0;
 }
 
        return 0;
 }

diff --git a/device.c b/device.c
index e1be5f4..eeb39a5 100644 (file)
--- a/device.c
+++ b/device.c
@@ -142,7 +142,7 @@ int device_claim(struct device *dev)
        return ret;
 }
 
        return ret;
 }
 

-void release_device(struct device *dev)
+void device_release(struct device *dev)

 {
        dev->active--;
        DPRINTF("release device %s, new refcount: %d\n", dev->ifname, dev->active);
 {
        dev->active--;
        DPRINTF("release device %s, new refcount: %d\n", dev->ifname, dev->active);

diff --git a/device.h b/device.h
index decbc74..7fc4975 100644 (file)
--- a/device.h
+++ b/device.h
@@ -138,7 +138,7 @@ void device_remove_user(struct device_user *dep);
 
 void device_set_present(struct device *dev, bool state);
 int device_claim(struct device *dev);
 
 void device_set_present(struct device *dev, bool state);
 int device_claim(struct device *dev);

-void release_device(struct device *dev);
+void device_release(struct device *dev);

 int check_device_state(struct device *dev);
 
 void device_free_all(void);
 int check_device_state(struct device *dev);
 
 void device_free_all(void);

diff --git a/interface.c b/interface.c
index 1f73130..a1e3004 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -91,7 +91,7 @@ static void
 mark_interface_down(struct interface *iface)
 {
        interface_del_ctx_addr(iface, NULL);
 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;
 }
 
        iface->state = IFS_DOWN;
 }
 

diff --git a/vlan.c b/vlan.c
index 85fe078..18cb939 100644 (file)
--- a/vlan.c
+++ b/vlan.c
@@ -32,7 +32,7 @@ static int vlan_set_device_state(struct device *dev, bool up)
        if (!up) {
                vldev->set_state(dev, false);
                system_vlan_del(dev);
        if (!up) {
                vldev->set_state(dev, false);
                system_vlan_del(dev);

-               release_device(vldev->dep.dev);
+               device_release(vldev->dep.dev);

                return 0;
        }
 
                return 0;
        }
 


@@ -43,7 +43,7 @@ static int vlan_set_device_state(struct device *dev, bool up)
        system_vlan_add(vldev->dep.dev, vldev->id);
        ret = vldev->set_state(dev, true);
        if (ret)
        system_vlan_add(vldev->dep.dev, vldev->id);
        ret = vldev->set_state(dev, true);
        if (ret)

-               release_device(vldev->dep.dev);
+               device_release(vldev->dep.dev);

 
        return ret;
 }
 
        return ret;
 }