Commit 30877961 authored by Xin Long's avatar Xin Long Committed by David S. Miller

ipvlan: fix IFLA_MTU ignored on NEWLINK

Commit 296d4856 ("ipvlan: inherit MTU from master device") adjusted
the mtu from the master device when creating a ipvlan device, but it
would also override the mtu value set in rtnl_create_link. It causes
IFLA_MTU param not to take effect.

So this patch is to not adjust the mtu if IFLA_MTU param is set when
creating a ipvlan device.

Fixes: 296d4856 ("ipvlan: inherit MTU from master device")
Reported-by: default avatarJianlin Shi <jishi@redhat.com>
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fedb1bd3
...@@ -594,7 +594,8 @@ int ipvlan_link_new(struct net *src_net, struct net_device *dev, ...@@ -594,7 +594,8 @@ int ipvlan_link_new(struct net *src_net, struct net_device *dev,
ipvlan->phy_dev = phy_dev; ipvlan->phy_dev = phy_dev;
ipvlan->dev = dev; ipvlan->dev = dev;
ipvlan->sfeatures = IPVLAN_FEATURES; ipvlan->sfeatures = IPVLAN_FEATURES;
ipvlan_adjust_mtu(ipvlan, phy_dev); if (!tb[IFLA_MTU])
ipvlan_adjust_mtu(ipvlan, phy_dev);
INIT_LIST_HEAD(&ipvlan->addrs); INIT_LIST_HEAD(&ipvlan->addrs);
spin_lock_init(&ipvlan->addrs_lock); spin_lock_init(&ipvlan->addrs_lock);
......
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