vxlan: changelink: Inline vxlan_dev_configure()

The changelink operation may cause change in remote address, and
therefore an FDB update, which can be vetoed. To properly handle
vetoing, vxlan_changelink() needs to be gradually updated.

In this patch simply replace vxlan_dev_configure() with the two
constituent calls.

Signed-off-by: Petr Machata <petrm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 92904ee160537661f010b1d085c043f961e93017..f2f419c60dfe5c9c9ae4fb95b20030d91ae24f26 100644 (file)
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -3793,6 +3793,7 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],
        struct vxlan_dev *vxlan = netdev_priv(dev);
        struct vxlan_rdst *dst = &vxlan->default_dst;
        unsigned long old_age_interval;
+       struct net_device *lowerdev;
        struct vxlan_rdst old_dst;
        struct vxlan_config conf;
        int err;
@@ -3805,10 +3806,13 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],
        old_age_interval = vxlan->cfg.age_interval;
        memcpy(&old_dst, dst, sizeof(struct vxlan_rdst));
 
-       err = vxlan_dev_configure(vxlan->net, dev, &conf, true, extack);
+       err = vxlan_config_validate(vxlan->net, &conf, &lowerdev,
+                                   vxlan, extack);
        if (err)
                return err;
 
+       vxlan_config_apply(dev, &conf, lowerdev, vxlan->net, true);
+
        if (old_age_interval != vxlan->cfg.age_interval)
                mod_timer(&vxlan->age_timer, jiffies);