From: David S. Miller <davem@davemloft.net>
Date: Fri, 21 Dec 2018 00:14:22 +0000 (-0800)
Subject: vxlan: Correct merge error.
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3a6d528a5e0179b1e8b20033c5cb7384dd7a830d;p=linux.git

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 <davem@davemloft.net>
---

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 3d773634a8e24..5209ee9aac478 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;