conf: do not check union on wrong net type

This will obviously not work. Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 8fb5d4f8
...@@ -3049,27 +3049,6 @@ int lxc_create_network(struct lxc_handler *handler) ...@@ -3049,27 +3049,6 @@ int lxc_create_network(struct lxc_handler *handler)
netdev = iterator->elem; netdev = iterator->elem;
if (netdev->type != LXC_NET_MACVLAN && netdev->priv.macvlan_attr.mode) {
ERROR("Invalid macvlan.mode for a non-macvlan netdev");
return -1;
}
if (netdev->type != LXC_NET_VETH && netdev->priv.veth_attr.pair) {
ERROR("Invalid veth pair for a non-veth netdev");
return -1;
}
if (netdev->type != LXC_NET_VLAN && netdev->priv.vlan_attr.vid > 0) {
ERROR("Invalid vlan.id for a non-macvlan netdev");
return -1;
}
if (netdev->type < 0 || netdev->type > LXC_NET_MAXCONFTYPE) {
ERROR("invalid network configuration type '%d'",
netdev->type);
return -1;
}
if (netdev_conf[netdev->type](handler, netdev)) { if (netdev_conf[netdev->type](handler, netdev)) {
ERROR("failed to create netdev"); ERROR("failed to create netdev");
return -1; return -1;
...@@ -3114,9 +3093,9 @@ bool lxc_delete_network(struct lxc_handler *handler) ...@@ -3114,9 +3093,9 @@ bool lxc_delete_network(struct lxc_handler *handler)
if (ret < 0) if (ret < 0)
WARN("Failed to deconfigure network device"); WARN("Failed to deconfigure network device");
/* Recent kernel remove the virtual interfaces when the network /* Recent kernels remove the virtual interfaces when the network
* namespace is destroyed but in case we did not move the * namespace is destroyed but in case we did not move the
* interface to the network namespace, we have to destroy it * interface to the network namespace, we have to destroy it.
*/ */
ret = lxc_netdev_delete_by_index(netdev->ifindex); ret = lxc_netdev_delete_by_index(netdev->ifindex);
if (-ret == ENODEV) { if (-ret == ENODEV) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment