Commit 6ba480cc authored by Ido Schimmel's avatar Ido Schimmel Committed by Paolo Abeni
Browse files

vxlan: Relocate assignment of default remote device 



The default FDB entry can be associated with a net device if a physical
device (i.e., 'dev PHYS_DEV') was specified during the creation of the
VXLAN device.

The assignment of the net device pointer to 'dst->remote_dev' logically
belongs in the if block that resolves the pointer from the specified
ifindex, so move it there.

Reviewed-by: default avatarPetr Machata <petrm@nvidia.com>
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Link: https://patch.msgid.link/20250415121143.345227-6-idosch@nvidia.com


Reviewed-by: default avatarNikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent ccc203b9

drivers/net/vxlan/vxlan_core.c

+3 −2
Original line number Diff line number Diff line
@@ -3967,6 +3967,8 @@ static int __vxlan_dev_create(struct net *net, struct net_device *dev, 
		err = netdev_upper_dev_link(remote_dev, dev, extack);

		if (err)

			goto unregister;



		dst->remote_dev = remote_dev;

	}



	err = rtnl_configure_link(dev, NULL, 0, NULL);
@@ -3994,8 +3996,7 @@ static int __vxlan_dev_create(struct net *net, struct net_device *dev, 
	}



	list_add(&vxlan->next, &vn->vxlan_list);

	if (remote_dev)

		dst->remote_dev = remote_dev;



	return 0;



unlink: