summaryrefslogtreecommitdiff
path: root/net/wireless/core.c
diff options
context:
space:
mode:
authorAndrei Vagin <avagin@gmail.com>2021-04-05 00:12:23 -0700
committerDavid S. Miller <davem@davemloft.net>2021-04-05 14:49:40 -0700
commiteeb85a14ee3494febb85ccfbee0772eda0823b13 (patch)
tree7d5dbe29daf44df707f4439e8f8e6441ed13ba43 /net/wireless/core.c
parentd3295869c40cb69a2c599000009b3fde43cec2ec (diff)
downloadlwn-eeb85a14ee3494febb85ccfbee0772eda0823b13.tar.gz
lwn-eeb85a14ee3494febb85ccfbee0772eda0823b13.zip
net: Allow to specify ifindex when device is moved to another namespace
Currently, we can specify ifindex on link creation. This change allows to specify ifindex when a device is moved to another network namespace. Even now, a device ifindex can be changed if there is another device with the same ifindex in the target namespace. So this change doesn't introduce completely new behavior, it adds more control to the process. CRIU users want to restore containers with pre-created network devices. A user will provide network devices and instructions where they have to be restored, then CRIU will restore network namespaces and move devices into them. The problem is that devices have to be restored with the same indexes that they have before C/R. Cc: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com> Suggested-by: Christian Brauner <christian.brauner@ubuntu.com> Signed-off-by: Andrei Vagin <avagin@gmail.com> Reviewed-by: Christian Brauner <christian.brauner@ubuntu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/core.c')
-rw-r--r--net/wireless/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c
index a2785379df6e..fabb677b7d58 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -165,7 +165,7 @@ int cfg80211_switch_netns(struct cfg80211_registered_device *rdev,
if (!wdev->netdev)
continue;
wdev->netdev->features &= ~NETIF_F_NETNS_LOCAL;
- err = dev_change_net_namespace(wdev->netdev, net, "wlan%d");
+ err = dev_change_net_namespace(wdev->netdev, net, "wlan%d", 0);
if (err)
break;
wdev->netdev->features |= NETIF_F_NETNS_LOCAL;
@@ -182,7 +182,7 @@ int cfg80211_switch_netns(struct cfg80211_registered_device *rdev,
continue;
wdev->netdev->features &= ~NETIF_F_NETNS_LOCAL;
err = dev_change_net_namespace(wdev->netdev, net,
- "wlan%d");
+ "wlan%d", 0);
WARN_ON(err);
wdev->netdev->features |= NETIF_F_NETNS_LOCAL;
}