path: root/drivers/net/vxlan.c
diff options
authorPetr Machata <petrm@mellanox.com>2019-01-16 23:06:39 +0000
committerDavid S. Miller <davem@davemloft.net>2019-01-17 15:18:46 -0800
commit8db9427d52b894276383091883b6a8bc5bb0c14d (patch)
treefca43e0138713500af0aff1f2bf79a62d6e5711e /drivers/net/vxlan.c
parentvxlan: Allow vetoing of FDB notifications (diff)
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>
Diffstat (limited to 'drivers/net/vxlan.c')
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 92904ee16053..f2f419c60dfe 100644
--- 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);