int ret;
if (up) {
- ret = system_add_ip_tunnel(dev->ifname, dev->config);
+ ret = system_add_ip_tunnel(dev, dev->config);
if (ret != 0)
return ret;
}
ret = tun->set_state(dev, up);
if (ret || !up)
- system_del_ip_tunnel(dev->ifname, dev->config);
+ system_del_ip_tunnel(dev);
return ret;
}
}
static struct device *
-tunnel_create(const char *name, struct blob_attr *attr)
+tunnel_create(const char *name, struct device_type *devtype,
+ struct blob_attr *attr)
{
struct tunnel *tun;
struct device *dev;
tun = calloc(1, sizeof(*tun));
+ if (!tun)
+ return NULL;
+
dev = &tun->dev;
- device_init(dev, &tunnel_device_type, name);
+
+ if (device_init(dev, devtype, name) < 0) {
+ device_cleanup(dev);
+ free(tun);
+ return NULL;
+ }
+
tun->set_state = dev->set_state;
dev->set_state = tunnel_set_state;
- device_apply_config(dev, &tunnel_device_type, attr);
+ device_apply_config(dev, devtype, attr);
device_set_present(dev, true);
return dev;
free(tun);
}
-const struct device_type tunnel_device_type = {
- .name = "IP tunnel",
+struct device_type tunnel_device_type = {
+ .name = "tunnel",
.config_params = &tunnel_attr_list,
.reload = tunnel_reload,
.create = tunnel_create,
.free = tunnel_free,
};
-
+static void __init tunnel_device_type_init(void)
+{
+ device_type_add(&tunnel_device_type);
+}