Skip to content

L
lxc
Commit 5c01fd0b by Stéphane Graber Committed by GitHub
Options

Merge pull request #1203 from brauner/2016-09-21/retrieve_mtu_from_bridge

2016 09 21/retrieve mtu from bridge
parents bb095beb 729e8bf6
Showing with 9 additions and 1 deletion
src/lxc/conf.c
...@@ -2521,7 +2521,7 @@ static int instantiate_veth(struct lxc_handler *handler, struct lxc_netdev *netd ...@@ -2521,7 +2521,7 @@ static int instantiate_veth(struct lxc_handler *handler, struct lxc_netdev *netd
{ {
char veth1buf[IFNAMSIZ], *veth1; char veth1buf[IFNAMSIZ], *veth1;
char veth2buf[IFNAMSIZ], *veth2; char veth2buf[IFNAMSIZ], *veth2;
int err, mtu = 0; int bridge_index, err, mtu = 0;
if (netdev->priv.veth_attr.pair) { if (netdev->priv.veth_attr.pair) {
veth1 = netdev->priv.veth_attr.pair; veth1 = netdev->priv.veth_attr.pair;
...@@ -2574,8 +2574,16 @@ static int instantiate_veth(struct lxc_handler *handler, struct lxc_netdev *netd ...@@ -2574,8 +2574,16 @@ static int instantiate_veth(struct lxc_handler *handler, struct lxc_netdev *netd
if (netdev->mtu) { if (netdev->mtu) {
mtu = atoi(netdev->mtu); mtu = atoi(netdev->mtu);
INFO("Retrieved mtu %d", mtu);
} else if (netdev->link) { } else if (netdev->link) {
bridge_index = if_nametoindex(netdev->link);
if (bridge_index) {
mtu = netdev_get_mtu(bridge_index);
INFO("Retrieved mtu %d from %s", mtu, netdev->link);
} else {
mtu = netdev_get_mtu(netdev->ifindex); mtu = netdev_get_mtu(netdev->ifindex);
INFO("Retrieved mtu %d from %s", mtu, veth2);
}
} }
if (mtu) { if (mtu) {
......
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