52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
Make network device ifindex sequential per network namespace.
|
|
|
|
---
|
|
include/net/net_namespace.h | 2 ++
|
|
net/core/dev.c | 13 ++++++-------
|
|
2 files changed, 8 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
|
|
index 1bf812b..6ee0db4 100644
|
|
--- a/include/net/net_namespace.h
|
|
+++ b/include/net/net_namespace.h
|
|
@@ -57,6 +57,8 @@ struct net {
|
|
struct sock *rtnl; /* rtnetlink socket */
|
|
struct sock *genl_sock;
|
|
|
|
+ int ifindex;
|
|
+
|
|
struct list_head dev_base_head;
|
|
struct hlist_head *dev_name_head;
|
|
struct hlist_head *dev_index_head;
|
|
diff --git a/net/core/dev.c b/net/core/dev.c
|
|
index 6561021..764a190 100644
|
|
--- a/net/core/dev.c
|
|
+++ b/net/core/dev.c
|
|
@@ -4975,12 +4975,11 @@ int dev_ioctl(struct net *net, unsigned int cmd, void __user *arg)
|
|
*/
|
|
static int dev_new_index(struct net *net)
|
|
{
|
|
- static int ifindex;
|
|
for (;;) {
|
|
- if (++ifindex <= 0)
|
|
- ifindex = 1;
|
|
- if (!__dev_get_by_index(net, ifindex))
|
|
- return ifindex;
|
|
+ if (++net->ifindex <= 0)
|
|
+ net->ifindex = 1;
|
|
+ if (!__dev_get_by_index(net, net->ifindex))
|
|
+ return net->ifindex;
|
|
}
|
|
}
|
|
|
|
@@ -5918,8 +5917,8 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char
|
|
/* Actually switch the network namespace */
|
|
dev_net_set(dev, net);
|
|
|
|
- /* If there is an ifindex conflict assign a new one */
|
|
- if (__dev_get_by_index(net, dev->ifindex)) {
|
|
+ /* Assign a new ifindex */
|
|
+ {
|
|
int iflink = (dev->iflink == dev->ifindex);
|
|
dev->ifindex = dev_new_index(net);
|
|
if (iflink)
|