projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[cascardo/linux.git]
/
drivers
/
net
/
ppp
/
pppoe.c
diff --git
a/drivers/net/ppp/pppoe.c
b/drivers/net/ppp/pppoe.c
index
d7fa96c
..
bb07ba9
100644
(file)
--- a/
drivers/net/ppp/pppoe.c
+++ b/
drivers/net/ppp/pppoe.c
@@
-1145,7
+1145,7
@@
static __net_init int pppoe_init_net(struct net *net)
static __net_exit void pppoe_exit_net(struct net *net)
{
-
proc_net_remove(net, "pppoe"
);
+
remove_proc_entry("pppoe", net->proc_net
);
}
static struct pernet_operations pppoe_net_ops = {