struct vlist_node node;
struct bridge_state *bst;
struct device_user dev;
+ struct uloop_timeout check_timer;
uint16_t pvid;
bool present;
bool active;
char name[];
};
-struct bridge_vlan_hotplug_port {
- struct list_head list;
- struct bridge_vlan_port port;
-};
-
static void
bridge_reset_primary(struct bridge_state *bst)
{
device_lock();
device_remove_user(&bm->dev);
+ uloop_timeout_cancel(&bm->check_timer);
/*
* When reloading the config and moving a device from one bridge to
uloop_timeout_set(&bst->retry, 100);
}
+static void
+bridge_member_check_cb(struct uloop_timeout *t)
+{
+ struct bridge_member *bm;
+ struct bridge_state *bst;
+
+ bm = container_of(t, struct bridge_member, check_timer);
+ bst = bm->bst;
+
+ if (system_bridge_vlan_check(&bst->dev, bm->dev.dev->ifname) <= 0)
+ return;
+
+ bridge_disable_member(bm, true);
+ bridge_enable_member(bm);
+}
+
static void
bridge_member_cb(struct device_user *dep, enum device_event ev)
{
system_if_apply_settings(&bst->dev, &bst->dev.settings,
DEV_OPT_MTU | DEV_OPT_MTU6);
break;
+ case DEV_EVENT_LINK_UP:
+ if (bst->has_vlans)
+ uloop_timeout_set(&bm->check_timer, 1000);
+ break;
case DEV_EVENT_LINK_DOWN:
if (!dev->settings.auth)
break;
bm->bst = bst;
bm->dev.cb = bridge_member_cb;
bm->dev.hotplug = hotplug;
+ bm->check_timer.cb = bridge_member_check_cb;
strcpy(bm->name, name);
bm->dev.dev = dev;
vlist_add(&bst->members, &bm->node, bm->name);
struct blob_attr *cur;
/* defaults */
+ memset(cfg, 0, sizeof(*cfg));
cfg->stp = false;
cfg->forward_delay = 2;
cfg->robustness = 2;