Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c7dafbf authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

net: Allow to create links with given ifindex 



Currently the RTM_NEWLINK results in -EOPNOTSUPP if the ifinfomsg->ifi_index
is not zero. I propose to allow requesting ifindices on link creation. This
is required by the checkpoint-restore to correctly restore a net namespace
(i.e. -- a container).

Signed-off-by: default avatarPavel Emelyanov <xemul@parallels.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b14f243a

net/core/dev.c

+6 −1
Original line number Diff line number Diff line
@@ -5579,7 +5579,12 @@ int register_netdevice(struct net_device *dev) 
		}

	}



	ret = -EBUSY;

	if (!dev->ifindex)

		dev->ifindex = dev_new_index(net);

	else if (__dev_get_by_index(net, dev->ifindex))

		goto err_uninit;



	if (dev->iflink == -1)

		dev->iflink = dev->ifindex;

net/core/rtnetlink.c

+7 −5
Original line number Diff line number Diff line
@@ -1812,8 +1812,6 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) 
			return -ENODEV;

		}



		if (ifm->ifi_index)

			return -EOPNOTSUPP;

		if (tb[IFLA_MAP] || tb[IFLA_MASTER] || tb[IFLA_PROTINFO])

			return -EOPNOTSUPP;
@@ -1839,10 +1837,14 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) 
			return PTR_ERR(dest_net);



		dev = rtnl_create_link(net, dest_net, ifname, ops, tb);



		if (IS_ERR(dev))

		if (IS_ERR(dev)) {

			err = PTR_ERR(dev);

		else if (ops->newlink)

			goto out;

		}



		dev->ifindex = ifm->ifi_index;



		if (ops->newlink)

			err = ops->newlink(net, dev, tb, data);

		else

			err = register_netdevice(dev);