projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix the exit status for the proto-shell task, use WEXITSTATUS
[project/netifd.git]
/
bridge.c
diff --git
a/bridge.c
b/bridge.c
index
1adabb9
..
70ea0f0
100644
(file)
--- a/
bridge.c
+++ b/
bridge.c
@@
-77,6
+77,8
@@
struct bridge_member {
bool present;
};
bool present;
};
+static void bridge_free_member(struct bridge_member *bm);
+
static int
bridge_disable_member(struct bridge_member *bm)
{
static int
bridge_disable_member(struct bridge_member *bm)
{
@@
-147,6
+149,8
@@
bridge_member_cb(struct device_user *dev, enum device_event ev)
if (bst->n_present == 0)
device_set_present(&bst->dev, false);
if (bst->n_present == 0)
device_set_present(&bst->dev, false);
+ if (dev->hotplug)
+ bridge_free_member(bm);
break;
default:
return;
break;
default:
return;
@@
-213,19
+217,17
@@
bridge_set_state(struct device *dev, bool up)
}
static struct bridge_member *
}
static struct bridge_member *
-bridge_create_member(struct bridge_state *bst, struct device *dev)
+bridge_create_member(struct bridge_state *bst, struct device *dev
, bool hotplug
)
{
struct bridge_member *bm;
bm = calloc(1, sizeof(*bm));
bm->bst = bst;
bm->dev.cb = bridge_member_cb;
{
struct bridge_member *bm;
bm = calloc(1, sizeof(*bm));
bm->bst = bst;
bm->dev.cb = bridge_member_cb;
- device_add_user(&bm->dev, dev);
-
+ bm->dev.hotplug = hotplug;
list_add_tail(&bm->list, &bst->members);
list_add_tail(&bm->list, &bst->members);
- if (bst->dev.active)
- bridge_enable_member(bm);
+ device_add_user(&bm->dev, dev);
return bm;
}
return bm;
}
@@
-254,7
+256,7
@@
bridge_add_member(struct bridge_state *bst, const char *name)
if (!dev)
return;
if (!dev)
return;
- bridge_create_member(bst, dev);
+ bridge_create_member(bst, dev
, false
);
}
static int
}
static int
@@
-262,7
+264,7
@@
bridge_hotplug_add(struct device *dev, struct device *member)
{
struct bridge_state *bst = container_of(dev, struct bridge_state, dev);
{
struct bridge_state *bst = container_of(dev, struct bridge_state, dev);
- bridge_create_member(bst, member);
+ bridge_create_member(bst, member
, true
);
return 0;
}
return 0;
}