[GRE]: Introduce empty ipgre_net structure and net init/exit ops.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 50972b3..d729ca8 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -39,6 +39,8 @@
#include <net/dsfield.h>
#include <net/inet_ecn.h>
#include <net/xfrm.h>
+#include <net/net_namespace.h>
+#include <net/netns/generic.h>
#ifdef CONFIG_IPV6
#include <net/ipv6.h>
@@ -122,6 +124,10 @@
static int ipgre_fb_tunnel_init(struct net_device *dev);
+static int ipgre_net_id;
+struct ipgre_net {
+};
+
static struct net_device *ipgre_fb_tunnel_dev;
/* Tunnel hash table */
@@ -1275,6 +1281,40 @@
.err_handler = ipgre_err,
};
+static int ipgre_init_net(struct net *net)
+{
+ int err;
+ struct ipgre_net *ign;
+
+ err = -ENOMEM;
+ ign = kmalloc(sizeof(struct ipgre_net), GFP_KERNEL);
+ if (ign == NULL)
+ goto err_alloc;
+
+ err = net_assign_generic(net, ipgre_net_id, ign);
+ if (err < 0)
+ goto err_assign;
+
+ return 0;
+
+err_assign:
+ kfree(ign);
+err_alloc:
+ return err;
+}
+
+static void ipgre_exit_net(struct net *net)
+{
+ struct ipgre_net *ign;
+
+ ign = net_generic(net, ipgre_net_id);
+ kfree(ign);
+}
+
+static struct pernet_operations ipgre_net_ops = {
+ .init = ipgre_init_net,
+ .exit = ipgre_exit_net,
+};
/*
* And now the modules code and kernel interface.
@@ -1302,6 +1342,10 @@
if ((err = register_netdev(ipgre_fb_tunnel_dev)))
goto err2;
+
+ err = register_pernet_gen_device(&ipgre_net_id, &ipgre_net_ops);
+ if (err < 0)
+ goto err3;
out:
return err;
err2:
@@ -1309,6 +1353,9 @@
err1:
inet_del_protocol(&ipgre_protocol, IPPROTO_GRE);
goto out;
+err3:
+ unregister_netdevice(ipgre_fb_tunnel_dev);
+ goto err1;
}
static void __exit ipgre_destroy_tunnels(void)
@@ -1333,6 +1380,8 @@
rtnl_lock();
ipgre_destroy_tunnels();
rtnl_unlock();
+
+ unregister_pernet_gen_device(ipgre_net_id, &ipgre_net_ops);
}
module_init(ipgre_init);