aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-12-20 16:14:22 -0800
committerDavid S. Miller <davem@davemloft.net>2018-12-20 16:14:22 -0800
commit3a6d528a5e0179b1e8b20033c5cb7384dd7a830d (patch)
treef0b06d6fc3d4fe5b7fc22f55ab34036cef1bef4b /drivers/net
parentMerge tag 'mlx5-updates-2018-12-19' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux (diff)
downloadlinux-dev-3a6d528a5e0179b1e8b20033c5cb7384dd7a830d.tar.xz
linux-dev-3a6d528a5e0179b1e8b20033c5cb7384dd7a830d.zip
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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/vxlan.c2
1 files changed, 1 insertions, 1 deletions
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;