make device_claim/device_release operate on the device_user instead of the device...

diff --git a/bridge.c b/bridge.c
index 3f8739cb5bd5bfc6aecc62e4e963edf099dbde04..c48381be2ad99302162226eda69f2ca5a1bb911d 100644 (file)
--- a/bridge.c
+++ b/bridge.c
@@ -72,7 +72,7 @@ bridge_disable_member(struct bridge_member *bm)
                return 0;
 
        system_bridge_delif(&bst->dev, bm->dev.dev);
-       device_release(bm->dev.dev);
+       device_release(&bm->dev);
 
        return 0;
 }
@@ -86,7 +86,7 @@ bridge_enable_member(struct bridge_member *bm)
        if (!bm->present)
                return 0;
 
-       ret = device_claim(bm->dev.dev);
+       ret = device_claim(&bm->dev);
        if (ret < 0)
                goto error;
 

diff --git a/device.c b/device.c
index 0019b6c2481185b5b34c5bc02d90410204565f55..c02335c1b906c653331d72af5c8220215bcfae97 100644 (file)
--- a/device.c
+++ b/device.c
@@ -120,10 +120,15 @@ static int set_device_state(struct device *dev, bool state)
        return 0;
 }
 
-int device_claim(struct device *dev)
+int device_claim(struct device_user *dep)
 {
+       struct device *dev = dep->dev;
        int ret;
 
+       if (dep->claimed)
+               return 0;
+
+       dep->claimed = true;
        DPRINTF("claim device %s, new refcount: %d\n", dev->ifname, dev->active + 1);
        if (++dev->active != 1)
                return 0;
@@ -138,8 +143,14 @@ int device_claim(struct device *dev)
        return ret;
 }
 
-void device_release(struct device *dev)
+void device_release(struct device_user *dep)
 {
+       struct device *dev = dep->dev;
+
+       if (!dep->claimed)
+               return;
+
+       dep->claimed = false;
        dev->active--;
        DPRINTF("release device %s, new refcount: %d\n", dev->ifname, dev->active);
        assert(dev->active >= 0);
@@ -254,6 +265,9 @@ void device_remove_user(struct device_user *dep)
 {
        struct device *dev = dep->dev;
 
+       if (dep->claimed)
+               device_release(dep);
+
        list_del(&dep->list);
 
        if (list_empty(&dev->users)) {

diff --git a/device.h b/device.h
index e11df1f224e8de0b69ceb189fe4b7edd8938188b..63ffb21a100f5ebc9ec295f10e43b66614bd6999 100644 (file)
--- a/device.h
+++ b/device.h
@@ -124,6 +124,7 @@ enum device_event {
 struct device_user {
        struct list_head list;
 
+       bool claimed;
        struct device *dev;
        void (*cb)(struct device_user *, enum device_event);
 };
@@ -147,8 +148,8 @@ void device_add_user(struct device_user *dep, struct device *iface);
 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_release(struct device *dev);
+int device_claim(struct device_user *dep);
+void device_release(struct device_user *dep);
 int check_device_state(struct device *dev);
 
 static inline void

diff --git a/interface.c b/interface.c
index f08fee01246fb0e7aedfcd7ff61da03b0d9b4d82..f6c32f49a0a13ced92724dfe88cf7c69a484a08a 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -89,7 +89,7 @@ static void
 mark_interface_down(struct interface *iface)
 {
        interface_del_ctx_addr(iface, NULL);
-       device_release(iface->main_dev.dev);
+       device_release(&iface->main_dev);
        iface->state = IFS_DOWN;
 }
 
@@ -101,7 +101,7 @@ __interface_set_up(struct interface *iface)
        if (iface->state != IFS_DOWN)
                return 0;
 
-       ret = device_claim(iface->main_dev.dev);
+       ret = device_claim(&iface->main_dev);
        if (ret)
                return ret;
 

diff --git a/vlan.c b/vlan.c
index 18cb939d1d7cb32e568e0742420973b4e809d5c6..d00cda0fd112e43c487869921eeeb314e226322f 100644 (file)
--- a/vlan.c
+++ b/vlan.c
@@ -32,18 +32,18 @@ static int vlan_set_device_state(struct device *dev, bool up)
        if (!up) {
                vldev->set_state(dev, false);
                system_vlan_del(dev);
-               device_release(vldev->dep.dev);
+               device_release(&vldev->dep);
                return 0;
        }
 
-       ret = device_claim(vldev->dep.dev);
+       ret = device_claim(&vldev->dep);
        if (ret)
                return ret;
 
        system_vlan_add(vldev->dep.dev, vldev->id);
        ret = vldev->set_state(dev, true);
        if (ret)
-               device_release(vldev->dep.dev);
+               device_release(&vldev->dep);
 
        return ret;
 }