Commit 3a6d528a authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parent e7164313

drivers/net/vxlan.c

+1 −1
Original line number Diff line number Diff line
@@ -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;