Commit 5314e3d6 authored by Xiao Liang's avatar Xiao Liang Committed by Jakub Kicinski
Browse files

net: xfrm: Use link netns in newlink() of rtnl_link_ops 



When link_net is set, use it as link netns instead of dev_net(). This
prepares for rtnetlink core to create device in target netns directly,
in which case the two namespaces may be different.

Signed-off-by: default avatarXiao Liang <shaw.leon@gmail.com>
Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/20250219125039.18024-10-shaw.leon@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5e72ce3e

net/xfrm/xfrm_interface_core.c

+4 −4
Original line number Diff line number Diff line
@@ -242,10 +242,9 @@ static void xfrmi_dev_free(struct net_device *dev) 
	gro_cells_destroy(&xi->gro_cells);

}



static int xfrmi_create(struct net_device *dev)

static int xfrmi_create(struct net *net, struct net_device *dev)

{

	struct xfrm_if *xi = netdev_priv(dev);

	struct net *net = dev_net(dev);

	struct xfrmi_net *xfrmn = net_generic(net, xfrmi_net_id);

	int err;
@@ -819,11 +818,12 @@ static int xfrmi_newlink(struct net_device *dev, 
			 struct netlink_ext_ack *extack)

{

	struct nlattr **data = params->data;

	struct net *net = dev_net(dev);

	struct xfrm_if_parms p = {};

	struct xfrm_if *xi;

	struct net *net;

	int err;



	net = params->link_net ? : dev_net(dev);

	xfrmi_netlink_parms(data, &p);

	if (p.collect_md) {

		struct xfrmi_net *xfrmn = net_generic(net, xfrmi_net_id);
@@ -852,7 +852,7 @@ static int xfrmi_newlink(struct net_device *dev, 
	xi->net = net;

	xi->dev = dev;



	err = xfrmi_create(dev);

	err = xfrmi_create(net, dev);

	return err;

}