summaryrefslogtreecommitdiffstats
path: root/include/net/net_namespace.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-10 09:16:27 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-10 09:16:27 +0100
commit4ecd33d930591d41fe356160593a9076467b961c (patch)
treeb9051a334540bbce38db1b2b03cebb4cf1d51f73 /include/net/net_namespace.h
parent7d5a78cd98c3a5eb83bd6a061c5ea6ef1e9b8fcb (diff)
parentf7160c7573615ec82c691e294cf80d920b5d588d (diff)
downloadkernel-crypto-4ecd33d930591d41fe356160593a9076467b961c.tar.gz
kernel-crypto-4ecd33d930591d41fe356160593a9076467b961c.tar.xz
kernel-crypto-4ecd33d930591d41fe356160593a9076467b961c.zip
Merge commit 'v2.6.28-rc4' into x86/apic
Diffstat (limited to 'include/net/net_namespace.h')
-rw-r--r--include/net/net_namespace.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 708009be88b..700c53a3c6f 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -214,6 +214,8 @@ struct pernet_operations {
extern int register_pernet_subsys(struct pernet_operations *);
extern void unregister_pernet_subsys(struct pernet_operations *);
+extern int register_pernet_gen_subsys(int *id, struct pernet_operations *);
+extern void unregister_pernet_gen_subsys(int id, struct pernet_operations *);
extern int register_pernet_device(struct pernet_operations *);
extern void unregister_pernet_device(struct pernet_operations *);
extern int register_pernet_gen_device(int *id, struct pernet_operations *);