From: Christian Brauner <christian.brauner@canonical.com>
Date: Wed, 21 Sep 2016 18:56:03 +0000 (+0200)
Subject: conf: retrieve mtu from netdev->link
X-Git-Tag: lxc-2.1.0~320^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9280f6590de5cd1a8ecb770133b80efc6c482b3;p=thirdparty%2Flxc.git

conf: retrieve mtu from netdev->link

When mtu is not set, try to retrieve mtu from netdev->link.

Signed-off-by: Christian Brauner <christian.brauner@canonical.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 22e2e29e5..53182fb0f 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -2521,7 +2521,7 @@ static int instantiate_veth(struct lxc_handler *handler, struct lxc_netdev *netd
 {
 	char veth1buf[IFNAMSIZ], *veth1;
 	char veth2buf[IFNAMSIZ], *veth2;
-	int err, mtu = 0;
+	int bridge_index, err, mtu = 0;
 
 	if (netdev->priv.veth_attr.pair) {
 		veth1 = netdev->priv.veth_attr.pair;
@@ -2574,8 +2574,13 @@ static int instantiate_veth(struct lxc_handler *handler, struct lxc_netdev *netd
 
 	if (netdev->mtu) {
 		mtu = atoi(netdev->mtu);
+		INFO("Retrieved mtu %d", mtu);
 	} else if (netdev->link) {
-		mtu = netdev_get_mtu(netdev->ifindex);
+		bridge_index = if_nametoindex(netdev->link);
+		if (!bridge_index)
+			INFO("Could not retrieve mtu from %s", netdev->link);
+		mtu = netdev_get_mtu(bridge_index);
+		INFO("Retrieved mtu %d from %s", mtu, netdev->link);
 	}
 
 	if (mtu) {