From 3a6d528a5e0179b1e8b20033c5cb7384dd7a830d Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 20 Dec 2018 16:14:22 -0800 Subject: vxlan: Correct merge error. When resolving the conflict wrt. the vxlan_fdb_update call in vxlan_changelink() I made the last argument false instead of true. Fix this. Signed-off-by: David S. Miller --- drivers/net/vxlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/net/vxlan.c') diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 3d773634a8e2..5209ee9aac47 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -3768,7 +3768,7 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[], dst->remote_vni, dst->remote_vni, dst->remote_ifindex, - NTF_SELF, false); + NTF_SELF, true); if (err) { spin_unlock_bh(&vxlan->hash_lock); return err; -- cgit v1.2.3-59-g8ed1b