projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reuse automatic ip6table value
[project/netifd.git]
/
vlan.c
diff --git
a/vlan.c
b/vlan.c
index
d1fb70b
..
4589675
100644
(file)
--- a/
vlan.c
+++ b/
vlan.c
@@
-61,6
+61,12
@@
static int vlan_set_device_state(struct device *dev, bool up)
return ret;
}
return ret;
}
+static void vlan_dev_set_name(struct vlan_device *vldev, struct device *dev)
+{
+ vldev->dev.hidden = dev->hidden;
+ snprintf(vldev->dev.ifname, IFNAMSIZ, "%s.%d", dev->ifname, vldev->id);
+}
+
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;
@@
-73,6
+79,10
@@
static void vlan_dev_cb(struct device_user *dep, enum device_event ev)
case DEV_EVENT_REMOVE:
device_set_present(&vldev->dev, false);
break;
case DEV_EVENT_REMOVE:
device_set_present(&vldev->dev, false);
break;
+ case DEV_EVENT_UPDATE_IFNAME:
+ vlan_dev_set_name(vldev, dep->dev);
+ device_broadcast_event(&vldev->dev, ev);
+ break;
default:
break;
}
default:
break;
}
@@
-89,7
+99,7
@@
static struct device *get_vlan_device(struct device *dev, int id, bool create)
struct device_user *dep;
/* look for an existing interface before creating a new one */
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;
@@
-104,7
+114,6
@@
static struct device *get_vlan_device(struct device *dev, int id, bool create)
return NULL;
vldev = calloc(1, sizeof(*vldev));
return NULL;
vldev = calloc(1, sizeof(*vldev));
- snprintf(vldev->dev.ifname, IFNAMSIZ, "%s.%d", dev->ifname, id);
device_init_virtual(&vldev->dev, &vlan_type, NULL);
vldev->dev.default_config = true;
device_init_virtual(&vldev->dev, &vlan_type, NULL);
vldev->dev.default_config = true;
@@
-113,6
+122,7
@@
static struct device *get_vlan_device(struct device *dev, int id, bool create)
vldev->dev.set_state = vlan_set_device_state;
vldev->id = id;
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);