BackPup/Linux
1
0 Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-10-07 05:31:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

vxlan: changelink: Inline vxlan_dev_configure()

Browse Source 
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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
Petr Machata authored and David S. Miller committed 2019-01-17 15:18:46 -08:00
1 parent 61f46fe8c6
commit 8db9427d52
1 file changed
+5 -1
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/vxlan.c
+5 -1
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_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);