projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bridge: Allow setting multicast_to_unicast option
[project/netifd.git]
/
vlan.c
diff --git
a/vlan.c
b/vlan.c
index
ee0652f
..
3d0a4cf
100644
(file)
--- a/
vlan.c
+++ b/
vlan.c
@@
-50,7
+50,7
@@
static int vlan_set_device_state(struct device *dev, bool up)
}
ret = device_claim(&vldev->dep);
}
ret = device_claim(&vldev->dep);
- if (ret)
+ if (ret
< 0
)
return ret;
system_vlan_add(vldev->dep.dev, vldev->id);
return ret;
system_vlan_add(vldev->dep.dev, vldev->id);
@@
-70,19
+70,28
@@
static void vlan_dev_set_name(struct vlan_device *vldev, struct device *dev)
static void vlan_dev_cb(struct device_user *dep, enum device_event ev)
{
struct vlan_device *vldev;
static void vlan_dev_cb(struct device_user *dep, enum device_event ev)
{
struct vlan_device *vldev;
+ bool new_state = false;
vldev = container_of(dep, struct vlan_device, dep);
switch(ev) {
case DEV_EVENT_ADD:
vldev = container_of(dep, struct vlan_device, dep);
switch(ev) {
case DEV_EVENT_ADD:
- device_set_present(&vldev->dev, true);
- break;
+ new_state = true;
case DEV_EVENT_REMOVE:
case DEV_EVENT_REMOVE:
- device_set_present(&vldev->dev, false);
+ device_set_present(&vldev->dev, new_state);
+ break;
+ case DEV_EVENT_LINK_UP:
+ new_state = true;
+ case DEV_EVENT_LINK_DOWN:
+ device_set_link(&vldev->dev, new_state);
break;
case DEV_EVENT_UPDATE_IFNAME:
vlan_dev_set_name(vldev, dep->dev);
device_broadcast_event(&vldev->dev, ev);
break;
break;
case DEV_EVENT_UPDATE_IFNAME:
vlan_dev_set_name(vldev, dep->dev);
device_broadcast_event(&vldev->dev, ev);
break;
+ case DEV_EVENT_TOPO_CHANGE:
+ /* Propagate topo changes */
+ device_broadcast_event(&vldev->dev, DEV_EVENT_TOPO_CHANGE);
+ break;
default:
break;
}
default:
break;
}
@@
-93,13
+102,14
@@
static struct device *get_vlan_device(struct device *dev, int id, bool create)
static const struct device_type vlan_type = {
.name = "VLAN",
.config_params = &device_attr_list,
static const struct device_type vlan_type = {
.name = "VLAN",
.config_params = &device_attr_list,
+ .keep_link_status = true,
.free = free_vlan_if,
};
struct vlan_device *vldev;
struct device_user *dep;
/* look for an existing interface before creating a new one */
.free = free_vlan_if,
};
struct vlan_device *vldev;
struct device_user *dep;
/* look for an existing interface before creating a new one */
- list_for_each_entry(dep, &dev->users
,
list) {
+ list_for_each_entry(dep, &dev->users
.list, list.
list) {
if (dep->cb != vlan_dev_cb)
continue;
if (dep->cb != vlan_dev_cb)
continue;
@@
-113,17
+123,19
@@
static struct device *get_vlan_device(struct device *dev, int id, bool create)
if (!create)
return NULL;
if (!create)
return NULL;
+ D(DEVICE, "Create vlan device '%s.%d'\n", dev->ifname, id);
+
vldev = calloc(1, sizeof(*vldev));
vldev = calloc(1, sizeof(*vldev));
- device_init_virtual(&vldev->dev, &vlan_type, NULL);
+ vldev->id = id;
+ vlan_dev_set_name(vldev, dev);
+
+ device_init(&vldev->dev, &vlan_type, vldev->dev.ifname);
vldev->dev.default_config = true;
vldev->set_state = vldev->dev.set_state;
vldev->dev.set_state = vlan_set_device_state;
vldev->dev.default_config = true;
vldev->set_state = vldev->dev.set_state;
vldev->dev.set_state = vlan_set_device_state;
- vldev->id = id;
- vlan_dev_set_name(vldev, dev);
-
vldev->dep.cb = vlan_dev_cb;
device_add_user(&vldev->dep, dev);
vldev->dep.cb = vlan_dev_cb;
device_add_user(&vldev->dep, dev);