Merge branch 'linus' into x86/urgent

[pandora-kernel.git] / drivers / net / pppol2tp.c

diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
index 849cc9c..9fbb2eb 100644 (file)
--- a/drivers/net/pppol2tp.c
+++ b/drivers/net/pppol2tp.c
@@ -232,7 +232,7 @@ static struct ppp_channel_ops pppol2tp_chan_ops = { pppol2tp_xmit , NULL };
 static const struct proto_ops pppol2tp_ops;
 
 /* per-net private data for this module */
-static int pppol2tp_net_id;
+static int pppol2tp_net_id __read_mostly;
 struct pppol2tp_net {
        struct list_head pppol2tp_tunnel_list;
        rwlock_t pppol2tp_tunnel_list_lock;
@@ -1537,7 +1537,7 @@ static struct sock *pppol2tp_prepare_tunnel_socket(struct net *net,
         * if the tunnel socket goes away.
         */
        tunnel->old_sk_destruct = sk->sk_destruct;
-       sk->sk_destruct = &pppol2tp_tunnel_destruct;
+       sk->sk_destruct = pppol2tp_tunnel_destruct;
 
        tunnel->sock = sk;
        sk->sk_allocation = GFP_ATOMIC;
@@ -2605,53 +2605,31 @@ static struct pppox_proto pppol2tp_proto = {
 
 static __net_init int pppol2tp_init_net(struct net *net)
 {
-       struct pppol2tp_net *pn;
+       struct pppol2tp_net *pn = pppol2tp_pernet(net);
        struct proc_dir_entry *pde;
-       int err;
-
-       pn = kzalloc(sizeof(*pn), GFP_KERNEL);
-       if (!pn)
-               return -ENOMEM;
 
        INIT_LIST_HEAD(&pn->pppol2tp_tunnel_list);
        rwlock_init(&pn->pppol2tp_tunnel_list_lock);
 
-       err = net_assign_generic(net, pppol2tp_net_id, pn);
-       if (err)
-               goto out;
-
        pde = proc_net_fops_create(net, "pppol2tp", S_IRUGO, &pppol2tp_proc_fops);
 #ifdef CONFIG_PROC_FS
-       if (!pde) {
-               err = -ENOMEM;
-               goto out;
-       }
+       if (!pde)
+               return -ENOMEM;
 #endif
 
        return 0;
-
-out:
-       kfree(pn);
-       return err;
 }
 
 static __net_exit void pppol2tp_exit_net(struct net *net)
 {
-       struct pppoe_net *pn;
-
        proc_net_remove(net, "pppol2tp");
-       pn = net_generic(net, pppol2tp_net_id);
-       /*
-        * if someone has cached our net then
-        * further net_generic call will return NULL
-        */
-       net_assign_generic(net, pppol2tp_net_id, NULL);
-       kfree(pn);
 }
 
 static struct pernet_operations pppol2tp_net_ops = {
        .init = pppol2tp_init_net,
        .exit = pppol2tp_exit_net,
+       .id   = &pppol2tp_net_id,
+       .size = sizeof(struct pppol2tp_net),
 };
 
 static int __init pppol2tp_init(void)
@@ -2665,7 +2643,7 @@ static int __init pppol2tp_init(void)
        if (err)
                goto out_unregister_pppol2tp_proto;
 
-       err = register_pernet_gen_device(&pppol2tp_net_id, &pppol2tp_net_ops);
+       err = register_pernet_device(&pppol2tp_net_ops);
        if (err)
                goto out_unregister_pppox_proto;
 
@@ -2684,7 +2662,7 @@ out_unregister_pppol2tp_proto:
 static void __exit pppol2tp_exit(void)
 {
        unregister_pppox_proto(PX_PROTO_OL2TP);
-       unregister_pernet_gen_device(pppol2tp_net_id, &pppol2tp_net_ops);
+       unregister_pernet_device(&pppol2tp_net_ops);
        proto_unregister(&pppol2tp_sk_proto);
 }