network: use __instantiate_ns_common() in instantiate_ns_phys() too

Fixes: https://lists.linuxcontainers.org/pipermail/lxc-users/2020-May/015245.htmlSigned-off-by: Christian Brauner <christian.brauner@ubuntu.com>

network: use __instantiate_ns_common() in instantiate_ns_phys() too
92a8d6e0 · Christian Brauner · Stéphane Graber · d7df0956 · 92a8d6e0
Unverified Commit 92a8d6e0 authored May 19, 2020 by Christian Brauner Committed by Stéphane Graber May 24, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 12 deletions

network.c src/lxc/network.c +6 -12

No files found.
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -860,7 +860,7 @@ static  instantiate_cb netdev_conf[LXC_NET_MAXCONFTYPE + 1] = {
 	[LXC_NET_NONE]    = instantiate_none,
 };
-static int __instantiate_common(struct lxc_netdev *netdev)
+static int __instantiate_ns_common(struct lxc_netdev *netdev)
 {
 	char current_ifname[IFNAMSIZ];
@@ -905,33 +905,27 @@ static int __instantiate_common(struct lxc_netdev *netdev)
 static int instantiate_ns_veth(struct lxc_netdev *netdev)
 {
-	return __instantiate_common(netdev);
+	return __instantiate_ns_common(netdev);
 }
 static int instantiate_ns_macvlan(struct lxc_netdev *netdev)
 {
-	return __instantiate_common(netdev);
+	return __instantiate_ns_common(netdev);
 }
 static int instantiate_ns_ipvlan(struct lxc_netdev *netdev)
 {
-	return __instantiate_common(netdev);
+	return __instantiate_ns_common(netdev);
 }
 static int instantiate_ns_vlan(struct lxc_netdev *netdev)
 {
-	return __instantiate_common(netdev);
+	return __instantiate_ns_common(netdev);
 }
 static int instantiate_ns_phys(struct lxc_netdev *netdev)
 {
-	netdev->ifindex = if_nametoindex(netdev->name);
+	return __instantiate_ns_common(netdev);
-	if (!netdev->ifindex)
-		return log_error_errno(-1, errno,
-				       "Failed to retrieve ifindex for network device with name %s",
-				       netdev->name);
-	return 0;
 }
 static int instantiate_ns_empty(struct lxc_netdev *netdev)