Revert "ath9k: Group Key fix for VAPs"

[safe/jmp/linux-2.6] / drivers / net / pppoe.c

diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index a1dcba2..b1b93ff 100644 (file)
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -89,7 +89,6 @@
 #define PPPOE_HASH_SIZE (1 << PPPOE_HASH_BITS)
 #define PPPOE_HASH_MASK        (PPPOE_HASH_SIZE - 1)
 
-static int pppoe_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
 static int pppoe_xmit(struct ppp_channel *chan, struct sk_buff *skb);
 static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb);
 
@@ -258,7 +257,7 @@ static inline struct pppox_sock *get_item_by_addr(struct net *net,
        dev = dev_get_by_name_rcu(net, sp->sa_addr.pppoe.dev);
        if (dev) {
                ifindex = dev->ifindex;
-               pn = net_generic(net, pppoe_net_id);
+               pn = pppoe_pernet(net);
                pppox_sock = get_item(pn, sp->sa_addr.pppoe.sid,
                                sp->sa_addr.pppoe.remote, ifindex);
        }
@@ -290,12 +289,6 @@ static void pppoe_flush_dev(struct net_device *dev)
        struct pppoe_net *pn;
        int i;
 
-       BUG_ON(dev == NULL);
-
-       pn = pppoe_pernet(dev_net(dev));
-       if (!pn) /* already freed */
-               return;
-
        write_lock_bh(&pn->hash_lock);
        for (i = 0; i < PPPOE_HASH_SIZE; i++) {
                struct pppox_sock *po = pn->hash_table[i];
@@ -323,8 +316,8 @@ static void pppoe_flush_dev(struct net_device *dev)
                        write_unlock_bh(&pn->hash_lock);
                        lock_sock(sk);
 
-                       if (po->pppoe_dev == dev
-                           && sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND)) {
+                       if (po->pppoe_dev == dev &&
+                           sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND)) {
                                pppox_unbind_sock(sk);
                                sk->sk_state = PPPOX_ZOMBIE;
                                sk->sk_state_change(sk);
@@ -368,7 +361,7 @@ static int pppoe_device_event(struct notifier_block *this,
 
        default:
                break;
-       };
+       }
 
        return NOTIFY_DONE;
 }
@@ -1139,59 +1132,37 @@ static struct pppox_proto pppoe_proto = {
 
 static __net_init int pppoe_init_net(struct net *net)
 {
-       struct pppoe_net *pn;
+       struct pppoe_net *pn = pppoe_pernet(net);
        struct proc_dir_entry *pde;
-       int err;
-
-       pn = kzalloc(sizeof(*pn), GFP_KERNEL);
-       if (!pn)
-               return -ENOMEM;
 
        rwlock_init(&pn->hash_lock);
 
-       err = net_assign_generic(net, pppoe_net_id, pn);
-       if (err)
-               goto out;
-
        pde = proc_net_fops_create(net, "pppoe", S_IRUGO, &pppoe_seq_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 pppoe_exit_net(struct net *net)
 {
-       struct pppoe_net *pn;
-
        proc_net_remove(net, "pppoe");
-       pn = net_generic(net, pppoe_net_id);
-       /*
-        * if someone has cached our net then
-        * further net_generic call will return NULL
-        */
-       net_assign_generic(net, pppoe_net_id, NULL);
-       kfree(pn);
 }
 
 static struct pernet_operations pppoe_net_ops = {
        .init = pppoe_init_net,
        .exit = pppoe_exit_net,
+       .id   = &pppoe_net_id,
+       .size = sizeof(struct pppoe_net),
 };
 
 static int __init pppoe_init(void)
 {
        int err;
 
-       err = register_pernet_gen_device(&pppoe_net_id, &pppoe_net_ops);
+       err = register_pernet_device(&pppoe_net_ops);
        if (err)
                goto out;
 
@@ -1212,7 +1183,7 @@ static int __init pppoe_init(void)
 out_unregister_pppoe_proto:
        proto_unregister(&pppoe_sk_proto);
 out_unregister_net_ops:
-       unregister_pernet_gen_device(pppoe_net_id, &pppoe_net_ops);
+       unregister_pernet_device(&pppoe_net_ops);
 out:
        return err;
 }
@@ -1224,7 +1195,7 @@ static void __exit pppoe_exit(void)
        dev_remove_pack(&pppoes_ptype);
        unregister_pppox_proto(PX_PROTO_OE);
        proto_unregister(&pppoe_sk_proto);
-       unregister_pernet_gen_device(pppoe_net_id, &pppoe_net_ops);
+       unregister_pernet_device(&pppoe_net_ops);
 }
 
 module_init(pppoe_init);