mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 04:31:50 +00:00
[SIT]: Introduce empty struct sit_net and init/exit net ops.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
f96c148fd5
commit
8190d9009a
@ -52,6 +52,8 @@
|
||||
#include <net/inet_ecn.h>
|
||||
#include <net/xfrm.h>
|
||||
#include <net/dsfield.h>
|
||||
#include <net/net_namespace.h>
|
||||
#include <net/netns/generic.h>
|
||||
|
||||
/*
|
||||
This version of net/ipv6/sit.c is cloned of net/ipv4/ip_gre.c
|
||||
@ -66,6 +68,10 @@ static int ipip6_fb_tunnel_init(struct net_device *dev);
|
||||
static int ipip6_tunnel_init(struct net_device *dev);
|
||||
static void ipip6_tunnel_setup(struct net_device *dev);
|
||||
|
||||
static int sit_net_id;
|
||||
struct sit_net {
|
||||
};
|
||||
|
||||
static struct net_device *ipip6_fb_tunnel_dev;
|
||||
|
||||
static struct ip_tunnel *tunnels_r_l[HASH_SIZE];
|
||||
@ -1068,6 +1074,41 @@ static void __exit sit_destroy_tunnels(void)
|
||||
}
|
||||
}
|
||||
|
||||
static int sit_init_net(struct net *net)
|
||||
{
|
||||
int err;
|
||||
struct sit_net *sitn;
|
||||
|
||||
err = -ENOMEM;
|
||||
sitn = kmalloc(sizeof(struct sit_net), GFP_KERNEL);
|
||||
if (sitn == NULL)
|
||||
goto err_alloc;
|
||||
|
||||
err = net_assign_generic(net, sit_net_id, sitn);
|
||||
if (err < 0)
|
||||
goto err_assign;
|
||||
|
||||
return 0;
|
||||
|
||||
err_assign:
|
||||
kfree(sitn);
|
||||
err_alloc:
|
||||
return err;
|
||||
}
|
||||
|
||||
static void sit_exit_net(struct net *net)
|
||||
{
|
||||
struct sit_net *sitn;
|
||||
|
||||
sitn = net_generic(net, sit_net_id);
|
||||
kfree(sitn);
|
||||
}
|
||||
|
||||
static struct pernet_operations sit_net_ops = {
|
||||
.init = sit_init_net,
|
||||
.exit = sit_exit_net,
|
||||
};
|
||||
|
||||
static void __exit sit_cleanup(void)
|
||||
{
|
||||
xfrm4_tunnel_deregister(&sit_handler, AF_INET6);
|
||||
@ -1076,6 +1117,8 @@ static void __exit sit_cleanup(void)
|
||||
sit_destroy_tunnels();
|
||||
unregister_netdevice(ipip6_fb_tunnel_dev);
|
||||
rtnl_unlock();
|
||||
|
||||
unregister_pernet_gen_device(sit_net_id, &sit_net_ops);
|
||||
}
|
||||
|
||||
static int __init sit_init(void)
|
||||
@ -1101,6 +1144,10 @@ static int __init sit_init(void)
|
||||
if ((err = register_netdev(ipip6_fb_tunnel_dev)))
|
||||
goto err2;
|
||||
|
||||
err = register_pernet_gen_device(&sit_net_id, &sit_net_ops);
|
||||
if (err < 0)
|
||||
goto err3;
|
||||
|
||||
out:
|
||||
return err;
|
||||
err2:
|
||||
@ -1108,6 +1155,9 @@ static int __init sit_init(void)
|
||||
err1:
|
||||
xfrm4_tunnel_deregister(&sit_handler, AF_INET6);
|
||||
goto out;
|
||||
err3:
|
||||
unregister_netdevice(ipip6_fb_tunnel_dev);
|
||||
goto err1;
|
||||
}
|
||||
|
||||
module_init(sit_init);
|
||||
|
Loading…
Reference in New Issue
Block a user