git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drivers/net/atl1e: Use netdev_printk helpers
[safe/jmp/linux-2.6]
/
drivers
/
net
/
pppoe.c
diff --git
a/drivers/net/pppoe.c
b/drivers/net/pppoe.c
index
a1dcba2
..
cdd11ba
100644
(file)
--- a/
drivers/net/pppoe.c
+++ b/
drivers/net/pppoe.c
@@
-323,8
+323,8
@@
static void pppoe_flush_dev(struct net_device *dev)
write_unlock_bh(&pn->hash_lock);
lock_sock(sk);
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);
pppox_unbind_sock(sk);
sk->sk_state = PPPOX_ZOMBIE;
sk->sk_state_change(sk);
@@
-1139,59
+1139,37
@@
static struct pppox_proto pppoe_proto = {
static __net_init int pppoe_init_net(struct net *net)
{
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;
struct proc_dir_entry *pde;
- int err;
-
- pn = kzalloc(sizeof(*pn), GFP_KERNEL);
- if (!pn)
- return -ENOMEM;
rwlock_init(&pn->hash_lock);
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
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;
#endif
return 0;
-
-out:
- kfree(pn);
- return err;
}
static __net_exit void pppoe_exit_net(struct net *net)
{
}
static __net_exit void pppoe_exit_net(struct net *net)
{
- struct pppoe_net *pn;
-
proc_net_remove(net, "pppoe");
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,
}
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;
};
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;
if (err)
goto out;
@@
-1212,7
+1190,7
@@
static int __init pppoe_init(void)
out_unregister_pppoe_proto:
proto_unregister(&pppoe_sk_proto);
out_unregister_net_ops:
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;
}
out:
return err;
}
@@
-1224,7
+1202,7
@@
static void __exit pppoe_exit(void)
dev_remove_pack(&pppoes_ptype);
unregister_pppox_proto(PX_PROTO_OE);
proto_unregister(&pppoe_sk_proto);
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);
}
module_init(pppoe_init);