|
@@ -1604,6 +1604,15 @@ static const struct nla_policy ipip6_policy[IFLA_IPTUN_MAX + 1] = {
|
|
|
#endif
|
|
|
};
|
|
|
|
|
|
+static void ipip6_dellink(struct net_device *dev, struct list_head *head)
|
|
|
+{
|
|
|
+ struct net *net = dev_net(dev);
|
|
|
+ struct sit_net *sitn = net_generic(net, sit_net_id);
|
|
|
+
|
|
|
+ if (dev != sitn->fb_tunnel_dev)
|
|
|
+ unregister_netdevice_queue(dev, head);
|
|
|
+}
|
|
|
+
|
|
|
static struct rtnl_link_ops sit_link_ops __read_mostly = {
|
|
|
.kind = "sit",
|
|
|
.maxtype = IFLA_IPTUN_MAX,
|
|
@@ -1615,6 +1624,7 @@ static struct rtnl_link_ops sit_link_ops __read_mostly = {
|
|
|
.changelink = ipip6_changelink,
|
|
|
.get_size = ipip6_get_size,
|
|
|
.fill_info = ipip6_fill_info,
|
|
|
+ .dellink = ipip6_dellink,
|
|
|
};
|
|
|
|
|
|
static struct xfrm_tunnel sit_handler __read_mostly = {
|
|
@@ -1629,9 +1639,10 @@ static struct xfrm_tunnel ipip_handler __read_mostly = {
|
|
|
.priority = 2,
|
|
|
};
|
|
|
|
|
|
-static void __net_exit sit_destroy_tunnels(struct sit_net *sitn, struct list_head *head)
|
|
|
+static void __net_exit sit_destroy_tunnels(struct net *net,
|
|
|
+ struct list_head *head)
|
|
|
{
|
|
|
- struct net *net = dev_net(sitn->fb_tunnel_dev);
|
|
|
+ struct sit_net *sitn = net_generic(net, sit_net_id);
|
|
|
struct net_device *dev, *aux;
|
|
|
int prio;
|
|
|
|
|
@@ -1706,11 +1717,10 @@ err_alloc_dev:
|
|
|
|
|
|
static void __net_exit sit_exit_net(struct net *net)
|
|
|
{
|
|
|
- struct sit_net *sitn = net_generic(net, sit_net_id);
|
|
|
LIST_HEAD(list);
|
|
|
|
|
|
rtnl_lock();
|
|
|
- sit_destroy_tunnels(sitn, &list);
|
|
|
+ sit_destroy_tunnels(net, &list);
|
|
|
unregister_netdevice_many(&list);
|
|
|
rtnl_unlock();
|
|
|
}
|