Commit cfb8fbf2 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

net: Simplify ip_gre pernet operations.



Take advantage of the new pernet automatic storage management,
and stop using compatibility network namespace functions.
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d2b3eb63
...@@ -1309,17 +1309,8 @@ static void ipgre_destroy_tunnels(struct ipgre_net *ign, struct list_head *head) ...@@ -1309,17 +1309,8 @@ static void ipgre_destroy_tunnels(struct ipgre_net *ign, struct list_head *head)
static int ipgre_init_net(struct net *net) static int ipgre_init_net(struct net *net)
{ {
struct ipgre_net *ign = net_generic(net, ipgre_net_id);
int err; int err;
struct ipgre_net *ign;
err = -ENOMEM;
ign = kzalloc(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;
ign->fb_tunnel_dev = alloc_netdev(sizeof(struct ip_tunnel), "gre0", ign->fb_tunnel_dev = alloc_netdev(sizeof(struct ip_tunnel), "gre0",
ipgre_tunnel_setup); ipgre_tunnel_setup);
...@@ -1340,10 +1331,6 @@ static int ipgre_init_net(struct net *net) ...@@ -1340,10 +1331,6 @@ static int ipgre_init_net(struct net *net)
err_reg_dev: err_reg_dev:
free_netdev(ign->fb_tunnel_dev); free_netdev(ign->fb_tunnel_dev);
err_alloc_dev: err_alloc_dev:
/* nothing */
err_assign:
kfree(ign);
err_alloc:
return err; return err;
} }
...@@ -1357,12 +1344,13 @@ static void ipgre_exit_net(struct net *net) ...@@ -1357,12 +1344,13 @@ static void ipgre_exit_net(struct net *net)
ipgre_destroy_tunnels(ign, &list); ipgre_destroy_tunnels(ign, &list);
unregister_netdevice_many(&list); unregister_netdevice_many(&list);
rtnl_unlock(); rtnl_unlock();
kfree(ign);
} }
static struct pernet_operations ipgre_net_ops = { static struct pernet_operations ipgre_net_ops = {
.init = ipgre_init_net, .init = ipgre_init_net,
.exit = ipgre_exit_net, .exit = ipgre_exit_net,
.id = &ipgre_net_id,
.size = sizeof(struct ipgre_net),
}; };
static int ipgre_tunnel_validate(struct nlattr *tb[], struct nlattr *data[]) static int ipgre_tunnel_validate(struct nlattr *tb[], struct nlattr *data[])
...@@ -1682,7 +1670,7 @@ static int __init ipgre_init(void) ...@@ -1682,7 +1670,7 @@ static int __init ipgre_init(void)
return -EAGAIN; return -EAGAIN;
} }
err = register_pernet_gen_device(&ipgre_net_id, &ipgre_net_ops); err = register_pernet_device(&ipgre_net_ops);
if (err < 0) if (err < 0)
goto gen_device_failed; goto gen_device_failed;
...@@ -1700,7 +1688,7 @@ static int __init ipgre_init(void) ...@@ -1700,7 +1688,7 @@ static int __init ipgre_init(void)
tap_ops_failed: tap_ops_failed:
rtnl_link_unregister(&ipgre_link_ops); rtnl_link_unregister(&ipgre_link_ops);
rtnl_link_failed: rtnl_link_failed:
unregister_pernet_gen_device(ipgre_net_id, &ipgre_net_ops); unregister_pernet_device(&ipgre_net_ops);
gen_device_failed: gen_device_failed:
inet_del_protocol(&ipgre_protocol, IPPROTO_GRE); inet_del_protocol(&ipgre_protocol, IPPROTO_GRE);
goto out; goto out;
...@@ -1710,7 +1698,7 @@ static void __exit ipgre_fini(void) ...@@ -1710,7 +1698,7 @@ static void __exit ipgre_fini(void)
{ {
rtnl_link_unregister(&ipgre_tap_ops); rtnl_link_unregister(&ipgre_tap_ops);
rtnl_link_unregister(&ipgre_link_ops); rtnl_link_unregister(&ipgre_link_ops);
unregister_pernet_gen_device(ipgre_net_id, &ipgre_net_ops); unregister_pernet_device(&ipgre_net_ops);
if (inet_del_protocol(&ipgre_protocol, IPPROTO_GRE) < 0) if (inet_del_protocol(&ipgre_protocol, IPPROTO_GRE) < 0)
printk(KERN_INFO "ipgre close: can't remove protocol\n"); printk(KERN_INFO "ipgre close: can't remove protocol\n");
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment