openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Petr Machata 2019-01-16 23:06:39 +00:00 committed by David S. Miller
parent 61f46fe8c6
commit 8db9427d52
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/vxlan.c
View File

@ -3793,6 +3793,7 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],
struct vxlan_dev *vxlan = netdev_priv(dev); struct vxlan_dev *vxlan = netdev_priv(dev);
struct vxlan_rdst *dst = &vxlan->default_dst; struct vxlan_rdst *dst = &vxlan->default_dst;
unsigned long old_age_interval; unsigned long old_age_interval;
struct net_device *lowerdev;
struct vxlan_rdst old_dst; struct vxlan_rdst old_dst;
struct vxlan_config conf; struct vxlan_config conf;
int err; int err;
@ -3805,10 +3806,13 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],
old_age_interval = vxlan->cfg.age_interval; old_age_interval = vxlan->cfg.age_interval;
memcpy(&old_dst, dst, sizeof(struct vxlan_rdst)); 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) if (err)
return err; return err;
vxlan_config_apply(dev, &conf, lowerdev, vxlan->net, true);
if (old_age_interval != vxlan->cfg.age_interval) if (old_age_interval != vxlan->cfg.age_interval)
mod_timer(&vxlan->age_timer, jiffies); mod_timer(&vxlan->age_timer, jiffies);