[PATCH net-next v7 07/11] net: xfrm: Use link netns in newlink() of rtnl_link_ops

[Xiao Liang]

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: Xiao Liang <shaw.l...@gmail.com>
---
 net/xfrm/xfrm_interface_core.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net/xfrm/xfrm_interface_core.c b/net/xfrm/xfrm_interface_core.c
index 77d50d4af4a1..d1198c63dd23 100644
--- a/net/xfrm/xfrm_interface_core.c
+++ b/net/xfrm/xfrm_interface_core.c
@@ -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 rtnl_newlink_params 
*params)
        struct netlink_ext_ack *extack = params->extack;
        struct net_device *dev = params->dev;
        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 rtnl_newlink_params *params)
        xi->net = net;
        xi->dev = dev;
 
-       err = xfrmi_create(dev);
+       err = xfrmi_create(net, dev);
        return err;
 }
 
-- 
2.47.1