Fixing MTU calculation in instantiate_veth()]

Signed-off-by: Stephane Nguyen <stephminh@yahoo.es>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 6bc9ecb4adc461fa640cd7c7c0943246d0e643fd..0913b22f5c448dbda20e0279a64e08673f7c92d1 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -2600,10 +2600,16 @@ static int instantiate_veth(struct lxc_handler *handler, struct lxc_netdev *netd
                goto out_delete;
        }
 
+       netdev->ifindex = if_nametoindex(veth2);
+       if (!netdev->ifindex) {
+               ERROR("failed to retrieve the index for %s", veth2);
+               goto out_delete;
+       }
+
        if (netdev->mtu) {
                mtu = atoi(netdev->mtu);
        } else if (netdev->link) {
-               mtu = netdev_get_mtu(if_nametoindex(netdev->link));
+               mtu = netdev_get_mtu(netdev->ifindex);
        }
 
        if (mtu) {
@@ -2626,12 +2632,6 @@ static int instantiate_veth(struct lxc_handler *handler, struct lxc_netdev *netd
                }
        }
 
-       netdev->ifindex = if_nametoindex(veth2);
-       if (!netdev->ifindex) {
-               ERROR("failed to retrieve the index for %s", veth2);
-               goto out_delete;
-       }
-
        err = lxc_netdev_up(veth1);
        if (err) {
                ERROR("failed to set %s up : %s", veth1, strerror(-err));